jenkins-bot has submitted this change and it was merged.
Change subject: Remove use of deprecated User::EDIT_TOKEN_SUFFIX
......................................................................
Remove use of deprecated User::EDIT_TOKEN_SUFFIX
Change-Id: Ib36f4aac202019548131f956bffe1c73e46030d2
---
M includes/user/User.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/user/User.php b/includes/user/User.php
index a272b37..bd1a642 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 @@
* @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 );
}
--
To view, visit https://gerrit.wikimedia.org/r/281275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib36f4aac202019548131f956bffe1c73e46030d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
