Merge "Remove User::EDIT_TOKEN_SUFFIX, a deprecated constant since 1.27."

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 1bee855..8d4ac33 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -161,6 +161,7 @@ because of Phabricator reports.
   * filterTimezoneInput()
   * getTimeZoneList()
 * mw.util.jsMessage(), deprecated in 1.20, was removed. Use mw.notify instead.
+* (T61113) User::EDIT_TOKEN_SUFFIX was removed. It was deprecated since 1.27.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/user/User.php b/includes/user/User.php
index 0e04946..79ccab9 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -55,13 +55,6 @@ class User implements IDBAccessObject, UserIdentity {
         */
        const INVALID_TOKEN = '*** INVALID ***';
 
-       /**
-        * Global constant made accessible as class constants so that autoloader
-        * magic can be used.
-        * @deprecated since 1.27, use \MediaWiki\Session\Token::SUFFIX
-        */
-       const EDIT_TOKEN_SUFFIX = Token::SUFFIX;
-
        /**
         * @const int Serialized record version.
         */