From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Sat, 12 Jun 2010 14:59:16 +0000 (+0000)
Subject: Bug 23747. Move the "Compare revisions" button before the RevDel and RevMove buttons.
X-Git-Tag: 1.31.0-rc.0~36529
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=32e9f2971cb3a8b543d44fcd509ecdc9556394d7;p=lhc%2Fweb%2Fwiklou.git

Bug 23747. Move the "Compare revisions" button before the RevDel and RevMove buttons.
All three are submit buttons, and the first will be used as the default action.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 73ce0bde86..50312b384a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -190,6 +190,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 23688) Correct mime types for Office 2007 OpenXML documents.
 * (bug 23787) Corrected $wgDefaultSkin's comment in DefaultSettings.php
 * (bug 23797) Xml::input() now allows '0' for the value parameter
+* (bug 23747) Make sure that on History pages, the RevDel button is not
+  accidently activated when hitting enter.
 
 === 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 a9e13b4573..cbf473d9c1 100644
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -381,6 +381,13 @@ class HistoryPager extends ReverseChronologicalPager {
 		$s .= Xml::hidden( 'action', 'historysubmit' ) . "\n";
 
 		$this->buttons = '<div>';
+		$this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
+			array(
+				'class'     => 'historysubmit',
+				'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+				'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+			)
+		) . "\n";
 		if( $wgUser->isAllowed('deleterevision') ) {
 			$float = $wgContLang->alignEnd();
 			# Note bug #20966, <button> is non-standard in IE<8
@@ -409,13 +416,6 @@ class HistoryPager extends ReverseChronologicalPager {
 				wfMsg( 'revisionmoveselectedversions' )
 			) . "\n";
 		}
-		$this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
-			array(
-				'class'     => 'historysubmit',
-				'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
-				'title'     => wfMsg( 'tooltip-compareselectedversions' ),
-			)
-		) . "\n";
 		$this->buttons .= '</div>';
 		$s .= $this->buttons . '<ul id="pagehistory">' . "\n";
 		return $s;