From: Leo Koppelkamm <diebuche@users.mediawiki.org>
Date: Tue, 12 Jul 2011 09:42:07 +0000 (+0000)
Subject: Followup r91871 per CR. Write back the actually executed action to . Ping r57415
X-Git-Tag: 1.31.0-rc.0~28917
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=4a34fb14cd247b3f00156a2c69af5747f78ae88c;p=lhc%2Fweb%2Fwiklou.git

Followup r91871 per CR. Write back the actually executed action to . Ping r57415
---

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 7440d5f2f3..97572f16df 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -271,21 +271,21 @@ class MediaWiki {
 
 		// Check for disabled actions
 		if ( in_array( $action, $wgDisabledActions ) ) {
-			return 'nosuchaction';
-		}
-
-		// Workaround for bug #20966: inability of IE to provide an action dependent
-		// on which submit button is clicked.
-		if ( $action === 'historysubmit' ) {
+			$action = 'nosuchaction';
+		} elseif ( $action === 'historysubmit' ) {
+			// Workaround for bug #20966: inability of IE to provide an action dependent
+			// on which submit button is clicked.
 			if ( $request->getBool( 'revisiondelete' ) ) {
-				return 'revisiondelete';
+				$action = 'revisiondelete';
 			} else {
-				return 'view';
+				$action = 'view';
 			}
 		} elseif ( $action == 'editredlink' ) {
-			return 'edit';
+			$action = 'edit';
 		}
-
+		
+		// Write back the executed action
+		$request->setVal( 'action', $action );
 		return $action;
 	}