Moved action=rollback to an Action subclass

diff --git a/includes/Article.php b/includes/Article.php
index a163911..8f141e6 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1228,6 +1228,13 @@ class Article extends Page {
                Action::factory( 'revert', $this )->show();
        }
 
+       /**
+        * User interface for rollback operations
+        */
+       public function rollback() {
+               Action::factory( 'rollback', $this )->show();
+       }
+
        /**
         * Output a redirect back to the article.
         * This is typically used after an edit.
@@ -1615,92 +1622,6 @@ class Article extends Page {
                }
        }
 
-       /**
-        * User interface for rollback operations
-        */
-       public function rollback() {
-               global $wgUser, $wgOut, $wgRequest;
-
-               $details = null;
-
-               $result = $this->mPage->doRollback(
-                       $wgRequest->getVal( 'from' ),
-                       $wgRequest->getText( 'summary' ),
-                       $wgRequest->getVal( 'token' ),
-                       $wgRequest->getBool( 'bot' ),
-                       $details
-               );
-
-               if ( in_array( array( 'actionthrottledtext' ), $result ) ) {
-                       $wgOut->rateLimited();
-                       return;
-               }
-
-               if ( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) {
-                       $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
-                       $errArray = $result[0];
-                       $errMsg = array_shift( $errArray );
-                       $wgOut->addWikiMsgArray( $errMsg, $errArray );
-
-                       if ( isset( $details['current'] ) ) {
-                               $current = $details['current'];
-
-                               if ( $current->getComment() != '' ) {
-                                       $wgOut->addWikiMsgArray( 'editcomment', array(
-                                               Linker::formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
-                               }
-                       }
-
-                       return;
-               }
-
-               # Display permissions errors before read-only message -- there's no
-               # point in misleading the user into thinking the inability to rollback
-               # is only temporary.
-               if ( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) {
-                       # array_diff is completely broken for arrays of arrays, sigh.
-                       # Remove any 'readonlytext' error manually.
-                       $out = array();
-                       foreach ( $result as $error ) {
-                               if ( $error != array( 'readonlytext' ) ) {
-                                       $out [] = $error;
-                               }
-                       }
-                       $wgOut->showPermissionsErrorPage( $out );
-
-                       return;
-               }
-
-               if ( $result == array( array( 'readonlytext' ) ) ) {
-                       $wgOut->readOnlyPage();
-
-                       return;
-               }
-
-               $current = $details['current'];
-               $target = $details['target'];
-               $newId = $details['newid'];
-               $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
-               $wgOut->setRobotPolicy( 'noindex,nofollow' );
-
-               if ( $current->getUserText() === '' ) {
-                       $old = wfMsg( 'rev-deleted-user' );
-               } else {
-                       $old = Linker::userLink( $current->getUser(), $current->getUserText() )
-                               . Linker::userToolLinks( $current->getUser(), $current->getUserText() );
-               }
-
-               $new = Linker::userLink( $target->getUser(), $target->getUserText() )
-                       . Linker::userToolLinks( $target->getUser(), $target->getUserText() );
-               $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
-               $wgOut->returnToMain( false, $this->getTitle() );
-
-               if ( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) {
-                       $de = new DifferenceEngine( $this->getTitle(), $current->getId(), $newId, false, true );
-                       $de->showDiff( '', '' );
-               }
-       }
-
        /**
         * Generate the navigation links when browsing through an article revisions
         * It shows the information as:

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index b81d976..69f6125 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -264,6 +264,7 @@ $wgAutoloadLocalClasses = array(
        'RevertAction' => 'includes/actions/RevertAction.php',
        'RevertFileAction' => 'includes/actions/RevertAction.php',
        'RevisiondeleteAction' => 'includes/actions/RevisiondeleteAction.php',
+       'RollbackAction' => 'includes/actions/RollbackAction.php',
        'UnwatchAction' => 'includes/actions/WatchAction.php',
        'WatchAction' => 'includes/actions/WatchAction.php',
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 35d1d01..13e0122 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5063,6 +5063,7 @@ $wgActions = array(
        'purge' => true,
        'revert' => true,
        'revisiondelete' => true,
+       'rollback' => true,
        'unwatch' => true,
        'watch' => true,
 );

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 251d1db..7440d5f 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -464,7 +464,6 @@ class MediaWiki {
                                wfProfileOut( __METHOD__ . '-raw' );
                                break;
                        case 'delete':
-                       case 'rollback':
                        case 'protect':
                        case 'unprotect':
                        case 'render':

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index d1e9b70..cf2c58a 100644 (file)
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1719,7 +1719,7 @@ class WikiPage extends Page {
                        return $errors;
                }
 
-               return $this->commitRollback( $user, $fromP, $summary, $bot, $resultDetails );
+               return $this->commitRollback( $fromP, $summary, $bot, $resultDetails, $user );
        }
 
        /**

diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
new file mode 100644 (file)
index 0000000..485177c
--- /dev/null
+++ b/includes/actions/RollbackAction.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Edit rollback user interface
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * @file
+ * @ingroup Action
+ */
+
+/**
+ * User interface for the rollback action
+ *
+ * @ingroup Action
+ */
+class RollbackAction extends FormlessAction {
+
+       public function getName() {
+               return 'rollback';
+       }
+
+       public function getRestriction() {
+               return 'rollback';
+       }
+
+       public function onView() {
+               $details = null;
+
+               $request = $this->getRequest();
+
+               $result = $this->page->doRollback(
+                       $request->getVal( 'from' ),
+                       $request->getText( 'summary' ),
+                       $request->getVal( 'token' ),
+                       $request->getBool( 'bot' ),
+                       $details,
+                       $this->getUser()
+               );
+
+               if ( in_array( array( 'actionthrottledtext' ), $result ) ) {
+                       throw new ThrottledError;
+               }
+
+               if ( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) {
+                       $this->getOutput()->setPageTitle( wfMsg( 'rollbackfailed' ) );
+                       $errArray = $result[0];
+                       $errMsg = array_shift( $errArray );
+                       $this->getOutput()->addWikiMsgArray( $errMsg, $errArray );
+
+                       if ( isset( $details['current'] ) ) {
+                               $current = $details['current'];
+
+                               if ( $current->getComment() != '' ) {
+                                       $this->getOutput()->addWikiMsgArray( 'editcomment', array(
+                                               Linker::formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
+                               }
+                       }
+
+                       return;
+               }
+
+               # Display permissions errors before read-only message -- there's no
+               # point in misleading the user into thinking the inability to rollback
+               # is only temporary.
+               if ( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) {
+                       # array_diff is completely broken for arrays of arrays, sigh.
+                       # Remove any 'readonlytext' error manually.
+                       $out = array();
+                       foreach ( $result as $error ) {
+                               if ( $error != array( 'readonlytext' ) ) {
+                                       $out [] = $error;
+                               }
+                       }
+                       $this->getOutput()->showPermissionsErrorPage( $out );
+
+                       return;
+               }
+
+               if ( $result == array( array( 'readonlytext' ) ) ) {
+                       throw new ReadOnlyError;
+               }
+
+               $current = $details['current'];
+               $target = $details['target'];
+               $newId = $details['newid'];
+               $this->getOutput()->setPageTitle( wfMsg( 'actioncomplete' ) );
+               $this->getOutput()->setRobotPolicy( 'noindex,nofollow' );
+
+               if ( $current->getUserText() === '' ) {
+                       $old = wfMsg( 'rev-deleted-user' );
+               } else {
+                       $old = Linker::userLink( $current->getUser(), $current->getUserText() )
+                               . Linker::userToolLinks( $current->getUser(), $current->getUserText() );
+               }
+
+               $new = Linker::userLink( $target->getUser(), $target->getUserText() )
+                       . Linker::userToolLinks( $target->getUser(), $target->getUserText() );
+               $this->getOutput()->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
+               $this->getOutput()->returnToMain( false, $this->getTitle() );
+
+               if ( !$request->getBool( 'hidediff', false ) && !$this->getUser()->getBoolOption( 'norollbackdiff', false ) ) {
+                       $de = new DifferenceEngine( $this->getTitle(), $current->getId(), $newId, false, true );
+                       $de->showDiff( '', '' );
+               }
+       }
+
+       protected function getDescription() {
+               return '';
+       }
+}