| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -277,21 +277,21 @@ |
| 278 | 278 | |
| 279 | 279 | // Check for disabled actions |
| 280 | 280 | if ( in_array( $action, $wgDisabledActions ) ) { |
| 281 | | - $action = 'nosuchaction'; |
| 282 | | - } elseif ( $action === 'historysubmit' ) { |
| 283 | | - // Workaround for bug #20966: inability of IE to provide an action dependent |
| 284 | | - // on which submit button is clicked. |
| | 281 | + return 'nosuchaction'; |
| | 282 | + } |
| | 283 | + |
| | 284 | + // Workaround for bug #20966: inability of IE to provide an action dependent |
| | 285 | + // on which submit button is clicked. |
| | 286 | + if ( $action === 'historysubmit' ) { |
| 285 | 287 | if ( $request->getBool( 'revisiondelete' ) ) { |
| 286 | | - $action = 'revisiondelete'; |
| | 288 | + return 'revisiondelete'; |
| 287 | 289 | } else { |
| 288 | | - $action = 'view'; |
| | 290 | + return 'view'; |
| 289 | 291 | } |
| 290 | 292 | } elseif ( $action == 'editredlink' ) { |
| 291 | | - $action = 'edit'; |
| | 293 | + return 'edit'; |
| 292 | 294 | } |
| 293 | 295 | |
| 294 | | - // Write back the executed action |
| 295 | | - $request->setVal( 'action', $action ); |
| 296 | 296 | return $action; |
| 297 | 297 | } |
| 298 | 298 | |
| — | — | @@ -512,7 +512,6 @@ |
| 513 | 513 | break; |
| 514 | 514 | default: |
| 515 | 515 | if ( wfRunHooks( 'UnknownAction', array( $act, $article ) ) ) { |
| 516 | | - $request->setVal( 'action', 'nosuchaction' ); |
| 517 | 516 | $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); |
| 518 | 517 | } |
| 519 | 518 | } |
| Index: trunk/phase3/includes/specials/SpecialEditWatchlist.php |
| — | — | @@ -485,9 +485,7 @@ |
| 486 | 486 | * @return int |
| 487 | 487 | */ |
| 488 | 488 | public static function getMode( $request, $par ) { |
| 489 | | - $act = $request->getVal( 'action' ); |
| 490 | | - $mode = ( $act == 'view' ) ? $par : $act; |
| 491 | | - $mode = strtolower( $mode ); |
| | 489 | + $mode = strtolower( $request->getVal( 'action', $par ) ); |
| 492 | 490 | switch( $mode ) { |
| 493 | 491 | case 'clear': |
| 494 | 492 | case self::EDIT_CLEAR: |