From 4438c46cf38ac644eb92d697cabafdb343b9f9ee Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 3 Feb 2010 04:54:20 +0000 Subject: [PATCH] Revert r56514 and r60421 per CR. --- includes/Linker.php | 2 +- includes/Xml.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index a89b81bf97..5d1f09686a 100644 --- 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 45517ccf42..464b142c05 100644 --- 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 ) -- 2.20.1