Followup to r41257: don't give out a token when we're in JSON callback mode

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index bc4a94d..c938604 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -82,7 +82,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
                if (isset($this->prop['options'])) {
                        $vals['options'] = (is_null($wgUser->mOptions) ? User::getDefaultOptions() : $wgUser->mOptions);
                }
-               if (isset($this->prop['preferencestoken'])) {
+               if (isset($this->prop['preferencestoken']) && is_null($this->getMain()->getRequest()->getVal('callback'))) {
                        $vals['preferencestoken'] = $wgUser->editToken();
                }
                if (isset($this->prop['editcount'])) {