API: (bug 17626) Added uiprop=email to meta=userinfo

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a9d613f..4378242 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -254,6 +254,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17502) meta=siteinfo&siprop=namespacealiases no longer lists namespace
   aliases already listed in siprop=namespaces
 * (bug 17529) rvend ignored when rvstartid is specified
+* (bug 17626) Added uiprop=email to list=userinfo
 
 === Languages updated in 1.15 ===
 

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 6a02f6c..9ab8874 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -92,6 +92,12 @@ class ApiQueryUserInfo extends ApiQueryBase {
                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;
        }
 
@@ -141,7 +147,8 @@ class ApiQueryUserInfo extends ApiQueryBase {
                                        'options',
                                        'preferencestoken',
                                        'editcount',
-                                       'ratelimits'
+                                       'ratelimits',
+                                       'email',
                                )
                        )
                );