From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 7 Aug 2010 18:56:52 +0000 (+0000)
Subject: Per comments, follow-up to r70278: make patrol tokens compatibles between api and... 
X-Git-Tag: 1.31.0-rc.0~35642
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=0a3d8dc0d35b27d2e841634b4f36034dea31692f;p=lhc%2Fweb%2Fwiklou.git

Per comments, follow-up to r70278: make patrol tokens compatibles between api and normal interface
---

diff --git a/includes/Article.php b/includes/Article.php
index 2614aea682..48ba854b0b 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1307,7 +1307,7 @@ class Article {
 		}
 
 		$sk = $wgUser->getSkin();
-		$token = $wgUser->editToken( $rcid );
+		$token = $wgUser->editToken();
 
 		$wgOut->addHTML(
 			"<div class='patrollink'>" .
@@ -2366,7 +2366,7 @@ class Article {
 		# If we haven't been given an rc_id value, we can't do anything
 		$rcid = (int) $wgRequest->getVal( 'rcid' );
 
-		if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $rcid ) ) {
+		if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
 			$wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' );
 			return;
 		}
diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index c75c7c029c..bb210eca89 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -236,7 +236,7 @@ CONTROL;
 			}
 			// Build the link
 			if( $rcid ) {
-				$token = $wgUser->editToken( $rcid );
+				$token = $wgUser->editToken();
 				$patrol = ' <span class="patrollink">[' . $sk->link(
 					$this->mTitle, 
 					wfMsgHtml( 'markaspatrolleddiff' ),
@@ -463,7 +463,7 @@ CONTROL;
 		# Add redundant patrol link on bottom...
 		if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) {
 			$sk = $wgUser->getSkin();
-			$token = $wgUser->editToken( $this->mRcidMarkPatrolled );
+			$token = $wgUser->editToken();
 			$wgOut->addHTML(
 				"<div class='patrollink'>[" . $sk->link(
 					$this->mTitle,