From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 20 Dec 2011 21:57:17 +0000 (+0000)
Subject: Revert r106094 (broken unnecessary cleanup), r106454 (ugly unneceessary cleanup)
X-Git-Tag: 1.31.0-rc.0~25849
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=d2d4d1c243e6d527d25af1133ac5d2f3b8741376;p=lhc%2Fweb%2Fwiklou.git

Revert r106094 (broken unnecessary cleanup), r106454 (ugly unneceessary cleanup)

The ugliness of this sort of code is probably part of why there's still a Linker::tooltip() function.
Please don't just replace it with worse code; if truly cleaning it up this should be done by giving a saner interface to the nav generation code
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 3d6942429d..1779566e99 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -97,10 +97,8 @@ class VectorTemplate extends BaseTemplate {
 					unset( $nav[$section][$key]['class'] );
 				}
 				if ( isset( $link['tooltiponly'] ) && $link['tooltiponly'] ) {
-					$tooltip = Linker::titleAttrib( $xmlID );
-					$tooltip = $tooltip === false ? '' : Xml::expandAttributes( array( 'title' => $tooltip ) );
-					$nav[$section][$key]['key'] = $tooltip;
-						
+					$nav[$section][$key]['key'] =
+						Linker::tooltip( $xmlID );
 				} else {
 					$nav[$section][$key]['key'] =
 						Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );