diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2016-12-16 21:11:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2016-12-16 21:11:39 +0000 |
| commit | 8a112ec84e5977074beb031bc9f32d0ad56d8ed5 (patch) | |
| tree | 7739c8dabd5e16fa6a7b9e44c7f2bc077e488f79 | |
| parent | 699ed46cc235437f5be89872477d18c20db9b676 (diff) | |
| parent | 866884763fdb3a632d6f98de31f9e4ae06f39934 (diff) | |
| download | mediawikicore-8a112ec84e5977074beb031bc9f32d0ad56d8ed5.tar.gz mediawikicore-8a112ec84e5977074beb031bc9f32d0ad56d8ed5.zip | |
Merge "Remove deprecated function User::isPasswordReminderThrottled()"
| -rw-r--r-- | RELEASE-NOTES-1.29 | 1 | ||||
| -rw-r--r-- | includes/user/User.php | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 4268b28a1a07..ef9d7341623b 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -129,6 +129,7 @@ changes to languages because of Phabricator reports. * Article::fetchContent() (deprecated in 1.21) was removed. * User::getPassword() (deprecated in 1.27) was removed. * User::getTemporaryPassword() (deprecated in 1.27) was removed. +* User::isPasswordReminderThrottled() (deprecated in 1.27) was removed. == Compatibility == diff --git a/includes/user/User.php b/includes/user/User.php index edcadbb27649..211c6297500d 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -2651,16 +2651,6 @@ class User implements IDBAccessObject { } /** - * Has password reminder email been sent within the last - * $wgPasswordReminderResendTime hours? - * @deprecated Removed in 1.27. See above. - * @return bool - */ - public function isPasswordReminderThrottled() { - throw new BadMethodCallException( __METHOD__ . ' has been removed in 1.27' ); - } - - /** * Get the user's e-mail address * @return string User's email address */ |