From b87c11ed3794aab58679319ee841663d69f8ba8f Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Fri, 11 Sep 2009 10:59:15 +0000 Subject: [PATCH] Fixes for r56068 and r55984: * missing "!" for the check $wgEnableTooltipsAndAccesskeys * Linker::tooltip() return a string, no an array * spacing fixes --- includes/Linker.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index 60407e8d0a..4b37f29bdb 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1942,7 +1942,7 @@ class Linker { */ public function tooltipAndAccesskey( $name ) { global $wgEnableTooltipsAndAccesskeys; - if (!$wgEnableTooltipsAndAccesskeys) + if ( !$wgEnableTooltipsAndAccesskeys ) return array(); # FIXME: If Sanitizer::expandAttributes() treated "false" as "output # no attribute" instead of "output '' as value for attribute", this @@ -1963,8 +1963,8 @@ class Linker { /** @deprecated Returns raw bits of HTML, use titleAttrib() */ public function tooltip( $name, $options = null ) { global $wgEnableTooltipsAndAccesskeys; - if ($wgEnableTooltipsAndAccesskeys) - return array(); + if ( !$wgEnableTooltipsAndAccesskeys ) + return ''; # FIXME: If Sanitizer::expandAttributes() treated "false" as "output # no attribute" instead of "output '' as value for attribute", this # would be two lines. -- 2.20.1