Revert r56514 and r60421 per CR.

diff --git a/includes/Linker.php b/includes/Linker.php
index a89b81b..5d1f096 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2019,7 +2019,7 @@ class Linker {
        public function tooltipAndAccesskeyAttribs( $name ) {
                global $wgEnableTooltipsAndAccesskeys;
                if ( !$wgEnableTooltipsAndAccesskeys )
-                       return '';
+                       return array();
                # FIXME: If Sanitizer::expandAttributes() treated "false" as "output
                # no attribute" instead of "output '' as value for attribute", this
                # would be three lines.

diff --git a/includes/Xml.php b/includes/Xml.php
index 45517cc..464b142 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -43,7 +43,7 @@ class Xml {
         */
        public static function expandAttributes( $attribs ) {
                $out = '';
-               if( empty( $attribs ) ) {
+               if( is_null( $attribs ) ) {
                        return null;
                } elseif( is_array( $attribs ) ) {
                        foreach( $attribs as $name => $val )