From 6b5d1c1c0e94a18189c390e52375388a80aa7489 Mon Sep 17 00:00:00 2001 From: Happy-melon Date: Mon, 20 Dec 2010 19:03:00 +0000 Subject: [PATCH] Revert rollback implementation of r78585, r78599. The way the API is set up, it's not possible to have some tokens on the new system and some on the old. --- includes/Article.php | 3 +-- includes/Linker.php | 2 +- includes/api/ApiQueryRevisions.php | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 43dffbde72..a01f40cb7c 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -3332,8 +3332,7 @@ class Article { $rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ); $errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) ); - $t = new Token( array( $this->mTitle->getPrefixedText(), $fromP ) ); - if ( !$t->match( $token ) ) { + if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) { $errors[] = array( 'sessionfailure' ); } diff --git a/includes/Linker.php b/includes/Linker.php index 16e53598eb..70d2b8a4c0 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1500,7 +1500,7 @@ class Linker { $query = array( 'action' => 'rollback', 'from' => $rev->getUserText(), - 'token' => Token::prepare( array( $title->getPrefixedText(), $rev->getUserText() ) ), + 'token' => $wgUser->editToken( array( $title->getPrefixedText(), $rev->getUserText() ) ), ); if ( $wgRequest->getBool( 'bot' ) ) { $query['bot'] = '1'; diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index 2208c5b8a7..2d7e549fa2 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -78,7 +78,8 @@ class ApiQueryRevisions extends ApiQueryBase { if ( !$wgUser->isAllowed( 'rollback' ) ) { return false; } - return Token::prepare( array( $title->getPrefixedText(), $rev->getUserText() ) ); + return $wgUser->editToken( array( $title->getPrefixedText(), + $rev->getUserText() ) ); } public function execute() { -- 2.20.1