X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fparser%2Fxml%2Fclass_XmlParser.php;h=76c39879e3efc28241e00c0e4996700248235477;hb=51caaa61ae7ee017abdfd116bbd8c438451315b2;hp=e21044f7f2f1934660ba7a1cfb60b0ddc8da10af;hpb=36e4d0eb331bd724db0bd23071271d5eaeb37b17;p=core.git

diff --git a/inc/classes/main/parser/xml/class_XmlParser.php b/inc/classes/main/parser/xml/class_XmlParser.php
index e21044f7..76c39879 100644
--- a/inc/classes/main/parser/xml/class_XmlParser.php
+++ b/inc/classes/main/parser/xml/class_XmlParser.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -64,7 +64,8 @@ class XmlParser extends BaseParser implements Parseable {
 	public function parseXmlContent ($content) {
 		// Convert all to UTF8
 		if (function_exists('recode')) {
-			$content = recode("html..utf8", $content);
+			// Recode found, so use it
+			$content = recode('html..utf8', $content);
 		} else {
 			// @TODO We need to find a fallback solution here
 			$this->partialStub('Cannot find recode extension!');
@@ -76,7 +77,10 @@ class XmlParser extends BaseParser implements Parseable {
 		// Force case-folding to on
 		xml_parser_set_option($xmlParser, XML_OPTION_CASE_FOLDING, true);
 
-		// Get template instance
+		// Set UTF-8
+		xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
+
+		// Get instance (we need this :( )
 		$templateInstance = $this->getTemplateInstance();
 
 		// Set object