(bug 24977) Remove the duplicate Access Key to compare selected revision in history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c45863d..521ae8f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -312,6 +312,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20744) Wiki forgets about an uploaded file
 * (bug 17913) Don't show "older edit" when no older edit available
 * (bug 6204) TOC not properly rendered when using $wgMaxTocLevel
+* (bug 24977) The accesskey in history page now lead directly to the diff 
+  instead of alterning focus between the two buttons.
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index e328e91..27c1153 100644 (file)
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -380,15 +380,19 @@ class HistoryPager extends ReverseChronologicalPager {
                $s .= Html::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n";
                $s .= Html::hidden( 'action', 'historysubmit' ) . "\n";
 
+               $s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions'),
+                       array( 'class' => 'historysubmit' ) ) . "\n";
+               
                $this->buttons = '<div>';
                $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
                        array( 'class' => 'historysubmit' )
                                + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
                ) . "\n";
+               
                if( $wgUser->isAllowed('deleterevision') ) {
                        $float = $wgContLang->alignEnd();
                        # Note bug #20966, <button> is non-standard in IE<8
-                       $this->buttons .= Html::element( 'button',
+                       $element = Html::element( 'button',
                                array(
                                        'type' => 'submit',
                                        'name' => 'revisiondelete',
@@ -398,11 +402,13 @@ class HistoryPager extends ReverseChronologicalPager {
                                ),
                                wfMsg( 'showhideselectedversions' )
                        ) . "\n";
+                       $s .= $element;
+                       $this->buttons .= $element;
                }
                if( $wgUser->isAllowed( 'revisionmove' ) ) {
                        $float = $wgContLang->alignEnd();
                        # Note bug #20966, <button> is non-standard in IE<8
-                       $this->buttons .= Html::element( 'button',
+                       $element = Html::element( 'button',
                                array(
                                        'type' => 'submit',
                                        'name' => 'revisionmove',
@@ -412,9 +418,11 @@ class HistoryPager extends ReverseChronologicalPager {
                                ),
                                wfMsg( 'revisionmoveselectedversions' )
                        ) . "\n";
+                       $s .= $element;
+                       $this->buttons .= $element;
                }
                $this->buttons .= '</div>';
-               $s .= $this->buttons . '<ul id="pagehistory">' . "\n";
+               $s .= '</div><ul id="pagehistory">' . "\n";
                return $s;
        }