Removed User::editToken() (deprecated since 1.19)

Change-Id: I734e9637317c0737e96e963bafb10ef966d6d172

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 0e44e71..fa36eb5 100644 (file)
--- 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 2ac0f2c..fed9664 100644 (file)
--- 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().