Merge "Remove deprecated function User::isPasswordReminderThrottled()"

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 4268b28..ef9d734 100644 (file)
--- 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 edcadbb..211c629 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -2650,16 +2650,6 @@ class User implements IDBAccessObject {
                throw new BadMethodCallException( __METHOD__ . ' has been removed in 1.27' );
        }
 
-       /**
-        * 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