http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61904
Revision: 61904
Author: tstarling
Date: 2010-02-03 04:54:20 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
Revert r56514 and r60421 per CR.
Modified Paths:
--------------
trunk/phase3/includes/Linker.php
trunk/phase3/includes/Xml.php
Modified: trunk/phase3/includes/Linker.php
===================================================================
--- trunk/phase3/includes/Linker.php 2010-02-03 04:29:20 UTC (rev 61903)
+++ trunk/phase3/includes/Linker.php 2010-02-03 04:54:20 UTC (rev 61904)
@@ -2019,7 +2019,7 @@
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.
Modified: trunk/phase3/includes/Xml.php
===================================================================
--- trunk/phase3/includes/Xml.php 2010-02-03 04:29:20 UTC (rev 61903)
+++ trunk/phase3/includes/Xml.php 2010-02-03 04:54:20 UTC (rev 61904)
@@ -43,7 +43,7 @@
*/
public static function expandAttributes( $attribs ) {
$out = '';
- if( empty( $attribs ) ) {
+ if( is_null( $attribs ) ) {
return null;
} elseif( is_array( $attribs ) ) {
foreach( $attribs as $name => $val )
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
