From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 13 May 2011 10:34:01 +0000 (+0000)
Subject: Re-do r87961 in a better way. Like I said, it's not acting the same as Linker::toolti... 
X-Git-Tag: 1.31.0-rc.0~30258
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=9a6b0a26e768bbbc7d9584aec3d4d35de67d8d41;p=lhc%2Fweb%2Fwiklou.git

Re-do r87961 in a better way. Like I said, it's not acting the same as Linker::tooltip, which is already expended. Calling it when generating the HTML will try to expend the output from Linker::tooltip, which failed. Instead expending it where it's not normalized yet.
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 442cb1da3b..6b72f1ff50 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -111,7 +111,7 @@ class VectorTemplate extends BaseTemplate {
 						Linker::tooltip( $xmlID );
 				} else {
 					$nav[$section][$key]['key'] =
-						Linker::tooltipAndAccesskeyAttribs( $xmlID );
+						Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
 				}
 			}
 		}