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

diff --combined includes/Linker.php
index 14821cf,0c00440..894c97d
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -530,7 -530,7 +530,7 @@@ class Linker 
         *
         * @param array $handlerParams Associative array of media handler parameters, to be passed
         *       to transform(). Typical keys are "width" and "page".
 -       * @param string $time Timestamp of the file, set as false for current
 +       * @param string|bool $time Timestamp of the file, set as false for current
         * @param string $query Query params for desc url
         * @param int|null $widthOption Used by the parser to remember the user preference thumbnailsize
         * @since 1.20
@@@ -2114,12 -2114,11 +2114,12 @@@
                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();
                                }
                        }
                }