| Index: trunk/phase3/includes/api/ApiQueryUserInfo.php |
| — | — | @@ -92,6 +92,12 @@ |
| 93 | 93 | if (isset($this->prop['ratelimits'])) { |
| 94 | 94 | $vals['ratelimits'] = $this->getRateLimits(); |
| 95 | 95 | } |
| | 96 | + if (isset($this->prop['email'])) { |
| | 97 | + $vals['email'] = $wgUser->getEmail(); |
| | 98 | + $auth = $wgUser->getEmailAuthenticationTimestamp(); |
| | 99 | + if(!is_null($auth)) |
| | 100 | + $vals['emailauthenticated'] = wfTimestamp(TS_ISO_8601, $auth); |
| | 101 | + } |
| 96 | 102 | return $vals; |
| 97 | 103 | } |
| 98 | 104 | |
| — | — | @@ -141,7 +147,8 @@ |
| 142 | 148 | 'options', |
| 143 | 149 | 'preferencestoken', |
| 144 | 150 | 'editcount', |
| 145 | | - 'ratelimits' |
| | 151 | + 'ratelimits', |
| | 152 | + 'email', |
| 146 | 153 | ) |
| 147 | 154 | ) |
| 148 | 155 | ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -254,6 +254,7 @@ |
| 255 | 255 | * (bug 17502) meta=siteinfo&siprop=namespacealiases no longer lists namespace |
| 256 | 256 | aliases already listed in siprop=namespaces |
| 257 | 257 | * (bug 17529) rvend ignored when rvstartid is specified |
| | 258 | +* (bug 17626) Added uiprop=email to list=userinfo |
| 258 | 259 | |
| 259 | 260 | === Languages updated in 1.15 === |
| 260 | 261 | |