From d041222faea6355342446aeb89177a84c7c30cfd Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 26 Sep 2014 21:28:00 +0200 Subject: [PATCH] Remove Preferences::trySetUserEmail (deprecated 1.20) Change-Id: I31b008c93eae54b2aecc18154d0c2e3df3fdb712 --- RELEASE-NOTES-1.25 | 1 + includes/Preferences.php | 22 ---------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index 0e100285b4..22033cffe0 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -38,6 +38,7 @@ changes to languages because of Bugzilla reports. * Removed ApiQueryUsers::getAutoGroups(). (deprecated since 1.20) * Removed XmlDumpWriter::schemaVersion(). (deprecated since 1.20) * Removed LogEventsList::getDisplayTitle(). (deprecated since 1.20) +* Removed Preferences::trySetUserEmail(). (deprecated since 1.20) == Compatibility == diff --git a/includes/Preferences.php b/includes/Preferences.php index 98fc936df4..8fa2f9adda 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -1467,28 +1467,6 @@ class Preferences { return Status::newGood(); } - - /** - * Try to set a user's email address. - * This does *not* try to validate the address. - * Caller is responsible for checking $wgAuth and 'editmyprivateinfo' - * right. - * - * @deprecated since 1.20; use User::setEmailWithConfirmation() instead. - * @param User $user - * @param string $newaddr New email address - * @return array (true on success or Status on failure, info string) - */ - public static function trySetUserEmail( User $user, $newaddr ) { - wfDeprecated( __METHOD__, '1.20' ); - - $result = $user->setEmailWithConfirmation( $newaddr ); - if ( $result->isGood() ) { - return array( true, $result->value ); - } else { - return array( $result, 'mailerror' ); - } - } } /** Some tweaks to allow js prefs to work */ -- 2.20.1