Another fix.

[lhc/web/wiklou.git] / includes / Xml.php

diff --git a/includes/Xml.php b/includes/Xml.php
index 509ed9a..4485626 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -50,7 +50,9 @@ class Xml {
                        $attribs = array_map( array( 'UtfNormal', 'cleanUp' ), $attribs );
                }
                if( $contents ) {
+                       wfProfileIn( __METHOD__ . '-norm' );
                        $contents = UtfNormal::cleanUp( $contents );
+                       wfProfileOut( __METHOD__ . '-norm' );
                }
                return self::element( $element, $attribs, $contents );
        }
@@ -67,7 +69,7 @@ class Xml {
         * @param $includehidden Bool: include hidden namespaces?
         * @return String: Html string containing the namespace selector
         */
-       public static function &namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
+       public static function namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
                global $wgContLang;
                if( $selected !== '' ) {
                        if( is_null( $selected ) ) {
@@ -128,10 +130,13 @@ class Xml {
         * @return string HTML
         */
        public static function check( $name, $checked=false, $attribs=array() ) {
-               return self::element( 'input', array(
-                       'name' => $name,
-                       'type' => 'checkbox',
-                       'value' => 1 ) + self::attrib( 'checked', $checked ) +  $attribs );
+               return self::element( 'input', array_merge(
+                       array(
+                               'name' => $name,
+                               'type' => 'checkbox',
+                               'value' => 1 ),
+                       self::attrib( 'checked', $checked ),
+                       $attribs ) );
        }
 
        /**
@@ -326,13 +331,13 @@ class Xml {
        }
 
        /**
-        * Escape html tags
-        * Basically replacing " > and < with HTML entities ( &quot;, &gt;, &lt;)
+        * Replace " > and < with their respective HTML entities ( &quot;,
+        * &gt;, &lt;)
         *
         * @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;' ),