| Index: trunk/phase3/includes/Action.php |
| — | — | @@ -89,20 +89,20 @@ |
| 90 | 90 | /** |
| 91 | 91 | * Get the action that will be executed, not necessarily the one passed |
| 92 | 92 | * passed through the "action" request parameter. Actions disabled in |
| 93 | | - * $wgDisabledActions will be replaced by "nosuchaction". |
| | 93 | + * $wgActions will be replaced by "nosuchaction". |
| 94 | 94 | * |
| 95 | 95 | * @since 1.19 |
| 96 | 96 | * @param $context IContextSource |
| 97 | 97 | * @return string: action name |
| 98 | 98 | */ |
| 99 | 99 | public final static function getActionName( IContextSource $context ) { |
| 100 | | - global $wgDisabledActions; |
| | 100 | + global $wgActions; |
| 101 | 101 | |
| 102 | 102 | $request = $context->getRequest(); |
| 103 | 103 | $actionName = $request->getVal( 'action', 'view' ); |
| 104 | 104 | |
| 105 | 105 | // Check for disabled actions |
| 106 | | - if ( in_array( $actionName, $wgDisabledActions ) ) { |
| | 106 | + if ( isset( $wgActions[$actionName] ) && $wgActions[$actionName] === false ) { |
| 107 | 107 | $actionName = 'nosuchaction'; |
| 108 | 108 | } |
| 109 | 109 | |