From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 11 Sep 2009 10:59:15 +0000 (+0000)
Subject: Fixes for r56068 and r55984:
X-Git-Tag: 1.31.0-rc.0~39790
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=b87c11ed3794aab58679319ee841663d69f8ba8f;p=lhc%2Fweb%2Fwiklou.git

Fixes for r56068 and r55984:
* missing "!" for the check $wgEnableTooltipsAndAccesskeys
* Linker::tooltip() return a string, no an array
* spacing fixes
---

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.