From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 3 Feb 2010 04:54:20 +0000 (+0000)
Subject: Revert r56514 and r60421 per CR.
X-Git-Tag: 1.31.0-rc.0~37966
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=4438c46cf38ac644eb92d697cabafdb343b9f9ee;p=lhc%2Fweb%2Fwiklou.git

Revert r56514 and r60421 per CR.
---

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 )