* someone forgot to declare a method static

* compatibility issue in zhconvert

diff --git a/includes/Xml.php b/includes/Xml.php
index 25c23ed..f2dd0e2 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -335,7 +335,7 @@ class Xml {
         * @param $in String: text that might contain HTML tags.
         * @return string Escaped string
         */
-       function escapeTagsOnly( $in ) {
+       public static function escapeTagsOnly( $in ) {
                return str_replace(
                        array( '"', '>', '<' ),
                        array( '&quot;', '&gt;', '&lt;' ),

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 4f8a285..d4fbaf3 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -24,9 +24,10 @@ class ZhConverter extends LanguageConverter {
     }
 
        /* there shouldn't be any latin text in Chinese conversion, so no need
-          to mark anything
+          to mark anything.
+          $noParse is there for compatibility with LanguageConvert::markNoConversion
     */
-       function markNoConversion($text) {
+       function markNoConversion($text, $noParse = false) {
                return $text;
        }