Liangent has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/91943


Change subject: DO NOT MERGE
......................................................................

DO NOT MERGE

Change-Id: Iaceecb26062266ccd9a1c63c126ff0d5471f7d97
---
M includes/EditPage.php
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/91943/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d7b2b5e..23bc7c1 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -912,10 +912,6 @@
                                $undo = $wgRequest->getInt( 'undo' );
 
                                if ( $undo > 0 && $undoafter > 0 ) {
-                                       if ( $undo < $undoafter ) {
-                                               # If they got undoafter and 
undo round the wrong way, switch them
-                                               list( $undo, $undoafter ) = 
array( $undoafter, $undo );
-                                       }
 
                                        $undorev = Revision::newFromId( $undo );
                                        $oldrev = Revision::newFromId( 
$undoafter );
@@ -924,8 +920,6 @@
                                        # the revisions exist and they were not 
deleted.
                                        # Otherwise, $content will be left 
as-is.
                                        if ( !is_null( $undorev ) && !is_null( 
$oldrev ) &&
-                                               $undorev->getPage() == 
$oldrev->getPage() &&
-                                               $undorev->getPage() == 
$this->mTitle->getArticleID() &&
                                                !$undorev->isDeleted( 
Revision::DELETED_TEXT ) &&
                                                !$oldrev->isDeleted( 
Revision::DELETED_TEXT ) ) {
 

-- 
To view, visit https://gerrit.wikimedia.org/r/91943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaceecb26062266ccd9a1c63c126ff0d5471f7d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <liang...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to