From 4b328d6c2e12d9c37406e3652a52f691a7ae02e6 Mon Sep 17 00:00:00 2001 From: Reedy Date: Tue, 15 Dec 2015 22:30:53 +0000 Subject: [PATCH] Removed User::editToken() (deprecated since 1.19) Change-Id: I734e9637317c0737e96e963bafb10ef966d6d172 --- RELEASE-NOTES-1.27 | 1 + includes/user/User.php | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index 0e44e717a5..fa36eb5510 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -188,6 +188,7 @@ changes to languages because of Phabricator reports. * OutputPage::appendSubtitle() was removed (deprecated since 1.19). * OutputPage::loginToUse() was removed (deprecated since 1.19). * Article::loadContent() was removed (deprecated since 1.19). +* User::editToken() was removed (deprecated since 1.19). == Compatibility == diff --git a/includes/user/User.php b/includes/user/User.php index 2ac0f2c0f6..fed9664abd 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -4115,19 +4115,6 @@ class User implements IDBAccessObject { } } - /** - * Alias for getEditToken. - * @deprecated since 1.19, use getEditToken instead. - * - * @param string|array $salt Array of Strings Optional function-specific data for hashing - * @param WebRequest|null $request WebRequest object to use or null to use $wgRequest - * @return string The new edit token - */ - public function editToken( $salt = '', $request = null ) { - wfDeprecated( __METHOD__, '1.19' ); - return $this->getEditToken( $salt, $request ); - } - /** * Internal implementation for self::getEditToken() and * self::matchEditToken(). -- 2.20.1