| Index: trunk/extensions/Lockdown/Lockdown.php |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 | function lockdownMediawikiPerformAction ( $output, $article, $title, $user, $request, $wiki ) { |
| 121 | 121 | global $wgActionLockdown; |
| 122 | 122 | |
| 123 | | - $action = $wiki->getVal( 'Action' ); |
| | 123 | + $action = $request->getVal( 'action', 'view' ); |
| 124 | 124 | |
| 125 | 125 | if ( !isset( $wgActionLockdown[$action] ) ) return true; |
| 126 | 126 | |
| Index: trunk/extensions/InlineEditor/InlineEditor.class.php |
| — | — | @@ -19,10 +19,10 @@ |
| 20 | 20 | * Checks whether or not to spawn the editor, and does so if nessicary. |
| 21 | 21 | */ |
| 22 | 22 | public static function mediaWikiPerformAction( $output, $article, $title, $user, $request, $wiki ) { |
| 23 | | - global $wgHooks; |
| | 23 | + global $wgHooks, $wgDisabledActions; |
| 24 | 24 | |
| 25 | 25 | // the action of the page, i.e. 'view' or 'edit' |
| 26 | | - $action = $wiki->getVal( 'Action' ); |
| | 26 | + $action = $request->getVal( 'action', 'view' ); |
| 27 | 27 | |
| 28 | 28 | // check if the editor could be used on this page, and if so, hide the [edit] links |
| 29 | 29 | if ( self::isValidBrowser() && !self::isAdvancedPage( $article, $title ) ) { |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // return if the action is not 'edit' or if it's disabled |
| 34 | | - if ( $action != 'edit' || in_array( $action, $wiki->getVal( 'DisabledActions', array() ) ) ) |
| | 34 | + if ( $action != 'edit' || in_array( $action, $wgDisabledActions ) ) |
| 35 | 35 | { |
| 36 | 36 | return true; |
| 37 | 37 | } |
| Index: trunk/extensions/InputBox/InputBox.hooks.php |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | $request, |
| 54 | 54 | $wiki ) |
| 55 | 55 | { |
| 56 | | - $action = $wiki->getVal( 'Action' ); |
| | 56 | + $action = $request->getVal( 'action', 'view' ); |
| 57 | 57 | if( $action !== 'edit' ){ |
| 58 | 58 | # not our problem |
| 59 | 59 | return true; |