diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/api/ApiQueryTokens.php | |
parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) |
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/api/ApiQueryTokens.php')
-rw-r--r-- | includes/api/ApiQueryTokens.php | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/includes/api/ApiQueryTokens.php b/includes/api/ApiQueryTokens.php index ba9c9377..65a08a3b 100644 --- a/includes/api/ApiQueryTokens.php +++ b/includes/api/ApiQueryTokens.php @@ -35,10 +35,12 @@ class ApiQueryTokens extends ApiQueryBase { public function execute() { $params = $this->extractRequestParams(); - $res = array(); + $res = array( + ApiResult::META_TYPE => 'assoc', + ); - if ( $this->getMain()->getRequest()->getVal( 'callback' ) !== null ) { - $this->setWarning( 'Tokens may not be obtained when using a callback' ); + if ( $this->lacksSameOriginSecurity() ) { + $this->setWarning( 'Tokens may not be obtained when the same-origin policy is not applied' ); return; } @@ -55,7 +57,6 @@ class ApiQueryTokens extends ApiQueryBase { public static function getTokenTypeSalts() { static $salts = null; if ( !$salts ) { - wfProfileIn( __METHOD__ ); $salts = array( 'csrf' => '', 'watch' => 'watch', @@ -63,9 +64,8 @@ class ApiQueryTokens extends ApiQueryBase { 'rollback' => 'rollback', 'userrights' => 'userrights', ); - wfRunHooks( 'ApiQueryTokensRegisterTypes', array( &$salts ) ); + Hooks::run( 'ApiQueryTokensRegisterTypes', array( &$salts ) ); ksort( $salts ); - wfProfileOut( __METHOD__ ); } return $salts; @@ -81,20 +81,12 @@ class ApiQueryTokens extends ApiQueryBase { ); } - public function getParamDescription() { - return array( - 'type' => 'Type of token(s) to request' - ); - } - - public function getDescription() { - return 'Gets tokens for data-modifying actions.'; - } - - protected function getExamples() { + protected function getExamplesMessages() { return array( - 'api.php?action=query&meta=tokens' => 'Retrieve a csrf token (the default)', - 'api.php?action=query&meta=tokens&type=watch|patrol' => 'Retrieve a watch token and a patrol token' + 'action=query&meta=tokens' + => 'apihelp-query+tokens-example-simple', + 'action=query&meta=tokens&type=watch|patrol' + => 'apihelp-query+tokens-example-types', ); } |