Merge "Linker.php: Do not double escape accesskey in tooltip"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 14 May 2014 18:31:00 +0000 (18:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 14 May 2014 18:31:00 +0000 (18:31 +0000)
1  2 
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();
                                }
                        }
                }