From bad08caf337b1b9162d034bf7fdb793bf46f88e9 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 18 Jul 2008 19:36:42 +0000
Subject: [PATCH] Accesskeys for minor edit/watch checkboxes on edit now work
 in Firefox 3.  It apparently doesn't like an accesskey being declared for
 both an input element and its label.

---
 RELEASE-NOTES         | 1 +
 includes/EditPage.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 65e60dfe19..bc188db7f9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -439,6 +439,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   history pages
 * (bug 14845) Bug in prefs javascript: Calling an array item without checking
   its existance.
+* Accesskeys for minor edit/watch checkboxes on edit now work in Firefox 3
 
 === API changes in 1.13 ===
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index d5a4383029..ce741a7211 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1966,7 +1966,7 @@ END
 			);
 			$checkboxes['minor'] =
 				Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) .
-				"&nbsp;<label for='wpMinoredit'".$skin->tooltipAndAccesskey('minoredit').">{$minorLabel}</label>";
+				"&nbsp;<label for='wpMinoredit'".$skin->tooltip('minoredit').">{$minorLabel}</label>";
 		}
 
 		$watchLabel = wfMsgExt('watchthis', array('parseinline'));
@@ -1979,7 +1979,7 @@ END
 			);
 			$checkboxes['watch'] =
 				Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) .
-				"&nbsp;<label for='wpWatchthis'".$skin->tooltipAndAccesskey('watch').">{$watchLabel}</label>";
+				"&nbsp;<label for='wpWatchthis'".$skin->tooltip('watch').">{$watchLabel}</label>";
 		}
 		return $checkboxes;
 	}
-- 
2.20.1