API: action=login now returns the correct waiting time in the details property

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 28546b4..3abb9d1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -225,6 +225,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13618) Added rcprop=redirect and rcshow=redirect to list=recentchanges
 * (bug 13544) Added oldid parameter to action=parse to allow for parsing of old revisions
 * (bug 13718) Return the proper continue parameter for cmsort=timestamp
+* action=login now returns the correct waiting time in the details property
 
 === Languages updated in 1.13 ===
 

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index e67de4a..6ecf464 100644 (file)
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -135,8 +135,9 @@ class ApiLogin extends ApiBase {
                }
 
                if ($result['result'] != 'Success') {
-                       $result['wait'] = $this->cacheBadLogin();
-                       $result['details'] = "Please wait " . self::THROTTLE_TIME . " seconds before next log-in attempt";
+                       $delay = $this->cacheBadLogin();
+                       $result['wait'] = $delay;
+                       $result['details'] = "Please wait " . $delay . " seconds before next log-in attempt";
                }
                // if we were allowed to try to login, memcache is fine