From 247fd2f649f80b3dc32387579c41fc5504db9d73 Mon Sep 17 00:00:00 2001 From: Florian Schmidt Date: Fri, 30 Mar 2018 23:25:18 +0200 Subject: [PATCH] Remove EDIT_TOKEN_SUFFIX constant It isn't used anymore anywhere, according to a code search on github. Depends-On: I56291c6a5b6c2bb359c6633748a68f4964d71923 Change-Id: I4b3f7b7bdf9bd0dbc8225bbcfb2da23016ae6bb3 --- RELEASE-NOTES-1.32 | 2 ++ includes/user/User.php | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index b8d55e0eb5..2eb3679ac7 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -54,6 +54,8 @@ changes to languages because of Phabricator reports. * wfShellExecDisabled() was removed (deprecated in 1.30). * The type string for the parameter $lang of DateFormatter::getInstance is removed (deprecated in 1.31). +* The EDIT_TOKEN_SUFFIX constant was removed (deprecated in 1.27). + Use MediaWiki\Session\Token::SUFFIX instead. === Deprecations in 1.32 === * Use of a StartProfiler.php file is deprecated in favour of placing diff --git a/includes/user/User.php b/includes/user/User.php index ea395f4acd..3335e59c08 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -33,13 +33,6 @@ use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\DBExpectedError; use Wikimedia\Rdbms\IDatabase; -/** - * String Some punctuation to prevent editing from broken text-mangling proxies. - * @deprecated since 1.27, use \MediaWiki\Session\Token::SUFFIX - * @ingroup Constants - */ -define( 'EDIT_TOKEN_SUFFIX', Token::SUFFIX ); - /** * The User object encapsulates all of the user-specific settings (user_id, * name, rights, email address, options, last login time). Client @@ -66,7 +59,7 @@ class User implements IDBAccessObject, UserIdentity { * magic can be used. * @deprecated since 1.27, use \MediaWiki\Session\Token::SUFFIX */ - const EDIT_TOKEN_SUFFIX = EDIT_TOKEN_SUFFIX; + const EDIT_TOKEN_SUFFIX = Token::SUFFIX; /** * @const int Serialized record version. -- 2.20.1