From 4a34fb14cd247b3f00156a2c69af5747f78ae88c Mon Sep 17 00:00:00 2001 From: Leo Koppelkamm Date: Tue, 12 Jul 2011 09:42:07 +0000 Subject: [PATCH] Followup r91871 per CR. Write back the actually executed action to . Ping r57415 --- includes/Wiki.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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; } -- 2.20.1