Index: trunk/phase3/includes/diff/DifferenceInterface.php |
— | — | @@ -243,7 +243,7 @@ |
244 | 244 | } |
245 | 245 | // Build the link |
246 | 246 | if( $rcid ) { |
247 | | - $token = $wgUser->editToken(); |
| 247 | + $token = $wgUser->editToken( $rcid ); |
248 | 248 | $patrol = ' <span class="patrollink">[' . $sk->link( |
249 | 249 | $this->mTitle, |
250 | 250 | wfMsgHtml( 'markaspatrolleddiff' ), |
— | — | @@ -474,7 +474,7 @@ |
475 | 475 | # Add redundant patrol link on bottom... |
476 | 476 | if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) { |
477 | 477 | $sk = $wgUser->getSkin(); |
478 | | - $token = $wgUser->editToken(); |
| 478 | + $token = $wgUser->editToken( $this->mRcidMarkPatrolled ); |
479 | 479 | $wgOut->addHTML( |
480 | 480 | "<div class='patrollink'>[" . $sk->link( |
481 | 481 | $this->mTitle, |
Index: trunk/phase3/includes/Article.php |
— | — | @@ -1308,7 +1308,7 @@ |
1309 | 1309 | } |
1310 | 1310 | |
1311 | 1311 | $sk = $wgUser->getSkin(); |
1312 | | - $token = $wgUser->editToken(); |
| 1312 | + $token = $wgUser->editToken( $rcid ); |
1313 | 1313 | |
1314 | 1314 | $wgOut->addHTML( |
1315 | 1315 | "<div class='patrollink'>" . |
— | — | @@ -2348,7 +2348,7 @@ |
2349 | 2349 | # If we haven't been given an rc_id value, we can't do anything |
2350 | 2350 | $rcid = (int) $wgRequest->getVal( 'rcid' ); |
2351 | 2351 | |
2352 | | - if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) { |
| 2352 | + if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $rcid ) ) { |
2353 | 2353 | $wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' ); |
2354 | 2354 | return; |
2355 | 2355 | } |