From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 6 Oct 2009 06:30:24 +0000 (+0000)
Subject: (bug 20966) Use the name of the <button> element to determine which button was clicke... 
X-Git-Tag: 1.31.0-rc.0~39372
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=c3e788299dbda57f6596b1fb7c59baeef1f4afd9;p=lhc%2Fweb%2Fwiklou.git

(bug 20966) Use the name of the <button> element to determine which button was clicked, instead of the value. This avoids some IE-specific non-standard behaviour.
---

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index a7bec6d1b8..b17688a675 100644
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -349,15 +349,17 @@ class HistoryPager extends ReverseChronologicalPager {
 		$s = Xml::openElement( 'form', array( 'action' => $wgScript,
 			'id' => 'mw-history-compare' ) ) . "\n";
 		$s .= Xml::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n";
+		$s .= Xml::hidden( 'action', 'historysubmit' ) . "\n";
 
 		$this->buttons = '<div>';
 		if( $wgUser->isAllowed('deletedhistory') ) {
 			$float = $wgContLang->isRTL() ? 'left' : 'right';
+			# Note bug #20966, <button> is non-standard in IE<8
 			$this->buttons .= Xml::element( 'button',
 				array(
 					'type' => 'submit',
-					'name' => 'action',
-					'value' => 'revisiondelete',
+					'name' => 'revisiondelete',
+					'value' => '1',
 					'style' => "float: $float;",
 					'class' => 'mw-history-revisiondelete-button',
 				),
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 9ef36b7be5..286bc8e747 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -465,6 +465,16 @@ class MediaWiki {
 			$action = 'nosuchaction';
 		}
 
+		# Workaround for bug #20966: inability of IE to provide an action dependent
+		# on which submit button is clicked.
+		if ( $action === 'historysubmit' ) {
+			if ( $request->getBool( 'revisiondelete' ) ) {
+				$action = 'revisiondelete';
+			} else {
+				$action = 'view';
+			}
+		}
+
 		switch( $action ) {
 			case 'view':
 				$output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 3cc91bb1c8..985b8fa9db 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -119,7 +119,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
 		// $this->ids = array_map( 'intval', $this->ids );
 		$this->ids = array_unique( array_filter( $this->ids ) );
 
-		if ( $wgRequest->getVal( 'action' ) == 'revisiondelete' ) {
+		if ( $wgRequest->getVal( 'action' ) == 'historysubmit' ) {
 			# For show/hide form submission from history page
 			$this->targetObj = $GLOBALS['wgTitle'];
 			$this->typeName = 'revision';