From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 14 May 2014 18:31:00 +0000 (+0000)
Subject: Merge "Linker.php: Do not double escape accesskey in tooltip"
X-Git-Tag: 1.31.0-rc.0~15717
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=4a4c24208517904e9e5aca123bc494f41960c448;p=lhc%2Fweb%2Fwiklou.git

Merge "Linker.php: Do not double escape accesskey in tooltip"
---

4a4c24208517904e9e5aca123bc494f41960c448
diff --cc includes/Linker.php
index 14821cf929,0c00440d30..894c97d5ac
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@@ -2114,12 -2114,11 +2114,12 @@@ class Linker 
  		if ( $options == 'withaccess' ) {
  			$accesskey = self::accesskey( $name );
  			if ( $accesskey !== false ) {
 +				// Should be build the same as in jquery.accessKeyLabel.js
  				if ( $tooltip === false || $tooltip === '' ) {
- 					$tooltip = wfMessage( 'brackets', $accesskey )->escaped();
+ 					$tooltip = wfMessage( 'brackets', $accesskey )->text();
  				} else {
- 					$tooltip .= wfMessage( 'word-separator' )->escaped();
- 					$tooltip .= wfMessage( 'brackets', $accesskey )->escaped();
+ 					$tooltip .= wfMessage( 'word-separator' )->text();
+ 					$tooltip .= wfMessage( 'brackets', $accesskey )->text();
  				}
  			}
  		}