From: firebus <russ@firebus.com>
Date: Mon, 3 Aug 2015 04:58:21 +0000 (-0700)
Subject: Match salt of WatchAction::show() and getWatchToken()
X-Git-Tag: 1.31.0-rc.0~10480^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=b6cc58b9535d0d2da4b9ddda8398d7529e7a3f80;p=lhc%2Fweb%2Fwiklou.git

Match salt of WatchAction::show() and getWatchToken()

Use getPrefixedDbkey() when generating salt, for consistency.

Bug: T106910
Change-Id: I93e22a2aaee8bf888fa613929c1027f5f0c2642f
---

diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 96473409da..8b6e329d07 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -64,7 +64,7 @@ class WatchAction extends FormAction {
 		$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() );