PATCH: [ 1850413 ] Web: Add "Translations" tab (fix encoding problems with web server)

diff --git a/Web/page.inc b/Web/page.inc
index 6dfd90a..23b390c 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -113,7 +113,7 @@
       $temp .= "</p>\n";
       $temp .= "</div>\n";
       $temp .= $this->getTabs();
-      $temp .= $this->getAds();;
+      $temp .= $this->getAds();
       $temp .= "<div id=\"content\">\n";
       switch ($this->_tab) {
         case WINMERGE_1_7: //if WinMerge 1.7 ...
@@ -308,9 +308,11 @@
     function convertXml2Array($filename) {
       if (file_exists($filename) == true) {
         $data = implode('', file($filename));
+        $data = utf8_encode($data);
         
-        $parser = xml_parser_create();
+        $parser = xml_parser_create('UTF-8');
         xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+        xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'ISO-8859-1');
         xml_parse_into_struct($parser, $data, $vals, $index);
         xml_parser_free($parser);
         
@@ -440,4 +442,4 @@
       return $html;
     }
   }
-?>
\ No newline at end of file
+?>