diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-09-04 05:51:59 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-09-04 05:51:59 +0200 |
| commit | 91e194556c52d2f354344f930419eef2dd6267f0 (patch) | |
| tree | 0cd12490d3cd3499274017c9b799d0f738d3719e /includes/api/ApiTokens.php | |
| parent | 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (diff) | |
Update to MediaWiki 1.21.2
Diffstat (limited to 'includes/api/ApiTokens.php')
| -rw-r--r-- | includes/api/ApiTokens.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/api/ApiTokens.php b/includes/api/ApiTokens.php index 7080f547..d220a5e6 100644 --- a/includes/api/ApiTokens.php +++ b/includes/api/ApiTokens.php @@ -48,6 +48,11 @@ class ApiTokens extends ApiBase { } private function getTokenTypes() { + // If we're in JSON callback mode, no tokens can be obtained + if ( !is_null( $this->getMain()->getRequest()->getVal( 'callback' ) ) ) { + return array(); + } + static $types = null; if ( $types ) { return $types; |