http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70640
Revision: 70640
Author: ialex
Date: 2010-08-07 18:56:52 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
Per comments, follow-up to r70278: make patrol tokens compatibles between api
and normal interface
Modified Paths:
--------------
trunk/phase3/includes/Article.php
trunk/phase3/includes/diff/DifferenceInterface.php
Modified: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php 2010-08-07 18:55:52 UTC (rev 70639)
+++ trunk/phase3/includes/Article.php 2010-08-07 18:56:52 UTC (rev 70640)
@@ -1307,7 +1307,7 @@
}
$sk = $wgUser->getSkin();
- $token = $wgUser->editToken( $rcid );
+ $token = $wgUser->editToken();
$wgOut->addHTML(
"<div class='patrollink'>" .
@@ -2366,7 +2366,7 @@
# 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;
}
Modified: trunk/phase3/includes/diff/DifferenceInterface.php
===================================================================
--- trunk/phase3/includes/diff/DifferenceInterface.php 2010-08-07 18:55:52 UTC
(rev 70639)
+++ trunk/phase3/includes/diff/DifferenceInterface.php 2010-08-07 18:56:52 UTC
(rev 70640)
@@ -236,7 +236,7 @@
}
// 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 @@
# 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,
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
