http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91942
Revision: 91942
Author: diebuche
Date: 2011-07-12 09:42:07 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Followup r91871 per CR. Write back the actually executed action to . Ping r57415
Modified Paths:
--------------
trunk/phase3/includes/Wiki.php
Modified: trunk/phase3/includes/Wiki.php
===================================================================
--- trunk/phase3/includes/Wiki.php 2011-07-12 08:15:43 UTC (rev 91941)
+++ trunk/phase3/includes/Wiki.php 2011-07-12 09:42:07 UTC (rev 91942)
@@ -271,21 +271,21 @@
// 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;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
