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

diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 9647340..8b6e329 100644 (file)
--- 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() );