From 91e194556c52d2f354344f930419eef2dd6267f0 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 4 Sep 2013 05:51:59 +0200 Subject: Update to MediaWiki 1.21.2 --- includes/api/ApiTokens.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'includes/api/ApiTokens.php') 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; -- cgit v1.2.3-54-g00ecf