Revert rollback implementation of r78585, r78599. The way the API is set up, it...

diff --git a/includes/Article.php b/includes/Article.php
index 43dffbd..a01f40c 100644 (file)
--- 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 16e5359..70d2b8a 100644 (file)
--- 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 2208c5b..2d7e549 100644 (file)
--- 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() {