jenkins-bot has submitted this change and it was merged.
Change subject: Match salt of WatchAction::show() and getWatchToken()
......................................................................
Match salt of WatchAction::show() and getWatchToken()
Use getPrefixedDbkey() when generating salt, for consistency.
Bug: T106910
Change-Id: I93e22a2aaee8bf888fa613929c1027f5f0c2642f
---
M includes/actions/WatchAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Fomafix: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 9647340..8b6e329 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -64,7 +64,7 @@
$this->checkCanExecute( $user );
// Must have valid token for this action/title
- $salt = array( $this->getName(), $this->getTitle()->getDBkey()
);
+ $salt = array( $this->getName(),
$this->getTitle()->getPrefixedDBkey() );
if ( $user->matchEditToken( $this->getRequest()->getVal(
'token' ), $salt ) ) {
$this->onSubmit( array() );
--
To view, visit https://gerrit.wikimedia.org/r/228774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93e22a2aaee8bf888fa613929c1027f5f0c2642f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Firebus <[email protected]>
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
