| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -271,21 +271,21 @@ |
| 272 | 272 | |
| 273 | 273 | // Check for disabled actions |
| 274 | 274 | if ( in_array( $action, $wgDisabledActions ) ) { |
| 275 | | - return 'nosuchaction'; |
| 276 | | - } |
| 277 | | - |
| 278 | | - // Workaround for bug #20966: inability of IE to provide an action dependent |
| 279 | | - // on which submit button is clicked. |
| 280 | | - if ( $action === 'historysubmit' ) { |
| | 275 | + $action = 'nosuchaction'; |
| | 276 | + } elseif ( $action === 'historysubmit' ) { |
| | 277 | + // Workaround for bug #20966: inability of IE to provide an action dependent |
| | 278 | + // on which submit button is clicked. |
| 281 | 279 | if ( $request->getBool( 'revisiondelete' ) ) { |
| 282 | | - return 'revisiondelete'; |
| | 280 | + $action = 'revisiondelete'; |
| 283 | 281 | } else { |
| 284 | | - return 'view'; |
| | 282 | + $action = 'view'; |
| 285 | 283 | } |
| 286 | 284 | } elseif ( $action == 'editredlink' ) { |
| 287 | | - return 'edit'; |
| | 285 | + $action = 'edit'; |
| 288 | 286 | } |
| 289 | | - |
| | 287 | + |
| | 288 | + // Write back the executed action |
| | 289 | + $request->setVal( 'action', $action ); |
| 290 | 290 | return $action; |
| 291 | 291 | } |
| 292 | 292 | |