From b7fb57870089775138469f60e75da64d6a389a48 Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Sun, 3 Apr 2016 12:04:42 +0300
Subject: [PATCH] Remove use of deprecated User::EDIT_TOKEN_SUFFIX

Change-Id: Ib36f4aac202019548131f956bffe1c73e46030d2
---
 includes/user/User.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/user/User.php b/includes/user/User.php
index a272b37d5f..bd1a642bf4 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -21,13 +21,14 @@
  */
 
 use MediaWiki\Session\SessionManager;
+use MediaWiki\Session\Token;
 
 /**
  * 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', MediaWiki\Session\Token::SUFFIX );
+define( 'EDIT_TOKEN_SUFFIX', Token::SUFFIX );
 
 /**
  * The User object encapsulates all of the user-specific settings (user_id,
@@ -4265,7 +4266,7 @@ class User implements IDBAccessObject {
 	 * @return bool Whether the token matches
 	 */
 	public function matchEditTokenNoSuffix( $val, $salt = '', $request = null, $maxage = null ) {
-		$val = substr( $val, 0, strspn( $val, '0123456789abcdef' ) ) . self::EDIT_TOKEN_SUFFIX;
+		$val = substr( $val, 0, strspn( $val, '0123456789abcdef' ) ) . Token::SUFFIX;
 		return $this->matchEditToken( $val, $salt, $request, $maxage );
 	}
 
-- 
2.20.1