Merge "Web installer: correctly show note for I4ecd0659"

[lhc/web/wiklou.git] / includes / api / ApiTokens.php

diff --git a/includes/api/ApiTokens.php b/includes/api/ApiTokens.php
index 7080f54..d220a5e 100644 (file)
--- 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;