From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 22 Jan 2007 17:59:43 +0000 (+0000)
Subject: * (bug 8719) Firefox release notes lie! Fix tooltips for Firefox 2 on x11;
X-Git-Tag: 1.31.0-rc.0~54222
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=a433c3d045d139b9b9dc1e76fe52a46a9a254a48;p=lhc%2Fweb%2Fwiklou.git

* (bug 8719) Firefox release notes lie! Fix tooltips for Firefox 2 on x11;
  accesskeys default settings appear to be same as Windows.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 30fbf68f3d..f92d02062c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -141,6 +141,8 @@ lighter making things easier to read.
   made with the new field left blank. 
 * Allow sending per-user contribution requests to "contributions" query group
 * (bug 3717) Update user count for AuthPlugin account autocreation
+* (bug 8719) Firefox release notes lie! Fix tooltips for Firefox 2 on x11;
+  accesskeys default settings appear to be same as Windows.
 
 
 == Languages updated ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ec85130ac5..2042f090a4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1109,7 +1109,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '51';
+$wgStyleVersion = '52';
 
 
 # Server-side caching:
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 27d992d6ea..3ee63520dc 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -484,9 +484,7 @@ if (is_opera) {
 	   || navigator.userAgent.toLowerCase().indexOf('mac') != -1
 	   || navigator.userAgent.toLowerCase().indexOf('konqueror') != -1 ) {
 	tooltipAccessKeyPrefix = 'ctrl-';
-} else if (is_ff2_x11) {
-	tooltipAccessKeyPrefix = 'ctrl-shift-';
-} else if (is_ff2_win) {
+} else if (is_ff2_x11 || is_ff2_win) {
 	tooltipAccessKeyPrefix = 'alt-shift-';
 }
 var tooltipAccessKeyRegexp = /\[(ctrl-)?(alt-)?(shift-)?(esc-)?.\]$/;