diff options
Diffstat (limited to 'includes/api/ApiQueryUserInfo.php')
| -rw-r--r-- | includes/api/ApiQueryUserInfo.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php index 203b7e25..ac99ad6d 100644 --- a/includes/api/ApiQueryUserInfo.php +++ b/includes/api/ApiQueryUserInfo.php @@ -57,7 +57,7 @@ class ApiQueryUserInfo extends ApiQueryBase { global $wgUser; $result = $this->getResult(); $vals = array(); - $vals['id'] = $wgUser->getId(); + $vals['id'] = intval($wgUser->getId()); $vals['name'] = $wgUser->getName(); if($wgUser->isAnon()) @@ -87,11 +87,17 @@ class ApiQueryUserInfo extends ApiQueryBase { $vals['preferencestoken'] = $wgUser->editToken(); } if (isset($this->prop['editcount'])) { - $vals['editcount'] = $wgUser->getEditCount(); + $vals['editcount'] = intval($wgUser->getEditCount()); } if (isset($this->prop['ratelimits'])) { $vals['ratelimits'] = $this->getRateLimits(); } + if (isset($this->prop['email'])) { + $vals['email'] = $wgUser->getEmail(); + $auth = $wgUser->getEmailAuthenticationTimestamp(); + if(!is_null($auth)) + $vals['emailauthenticated'] = wfTimestamp(TS_ISO_8601, $auth); + } return $vals; } @@ -122,8 +128,8 @@ class ApiQueryUserInfo extends ApiQueryBase { foreach($categories as $cat) if(isset($limits[$cat]) && !is_null($limits[$cat])) { - $retval[$action][$cat]['hits'] = $limits[$cat][0]; - $retval[$action][$cat]['seconds'] = $limits[$cat][1]; + $retval[$action][$cat]['hits'] = intval($limits[$cat][0]); + $retval[$action][$cat]['seconds'] = intval($limits[$cat][1]); } return $retval; } @@ -141,7 +147,8 @@ class ApiQueryUserInfo extends ApiQueryBase { 'options', 'preferencestoken', 'editcount', - 'ratelimits' + 'ratelimits', + 'email', ) ) ); @@ -174,6 +181,6 @@ class ApiQueryUserInfo extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryUserInfo.php 43764 2008-11-20 15:15:00Z catrope $'; + return __CLASS__ . ': $Id: ApiQueryUserInfo.php 47865 2009-02-27 16:03:01Z catrope $'; } } |