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

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

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 7af4d50..c938604 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -31,7 +31,7 @@ if (!defined('MEDIAWIKI')) {
 /**
  * Query module to get information about the currently logged-in user
  *
- * @addtogroup API
+ * @ingroup API
  */
 class ApiQueryUserInfo extends ApiQueryBase {
 
@@ -82,6 +82,9 @@ class ApiQueryUserInfo extends ApiQueryBase {
                if (isset($this->prop['options'])) {
                        $vals['options'] = (is_null($wgUser->mOptions) ? User::getDefaultOptions() : $wgUser->mOptions);
                }
+               if (isset($this->prop['preferencestoken']) && is_null($this->getMain()->getRequest()->getVal('callback'))) {
+                       $vals['preferencestoken'] = $wgUser->editToken();
+               }
                if (isset($this->prop['editcount'])) {
                        $vals['editcount'] = $wgUser->getEditCount();
                }
@@ -134,6 +137,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
                                        'groups',
                                        'rights',
                                        'options',
+                                       'preferencestoken',
                                        'editcount',
                                        'ratelimits'
                                )