Reverted r113803: makes already messy class messier (a bit to much)
authorAaron Schulz <aaron@users.mediawiki.org>
Wed, 14 Mar 2012 17:55:59 +0000 (17:55 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Wed, 14 Mar 2012 17:55:59 +0000 (17:55 +0000)
includes/diff/DifferenceEngine.php

index f1bee3c..e8f35f0 100644 (file)
@@ -1003,23 +1003,17 @@ class DifferenceEngine extends ContextSource {
                $this->loadRevisionIds();
 
                // Load the new revision object
-               if ( $this->mNewid && ( !$this->canUseWikiPage()
-                       || $this->mNewid !== $this->getWikiPage()->getLatest() ) )
-               {
-                       $this->mNewRev = Revision::newFromId( $this->mNewid );
-               } else {
-                       $this->mNewRev = $this->getWikiPage()->getRevision();
-                       $this->mNewPage = $this->getTitle();
-               }
+               $this->mNewRev = $this->mNewid
+                       ? Revision::newFromId( $this->mNewid )
+                       : Revision::newFromTitle( $this->getTitle() );
 
                if ( !$this->mNewRev instanceof Revision ) {
                        return false;
                }
-               if ( !$this->mNewPage instanceof Title ) {
-                       $this->mNewPage = $this->mNewRev->getTitle();
-               }
+
                // Update the new revision ID in case it was 0 (makes life easier doing UI stuff)
                $this->mNewid = $this->mNewRev->getId();
+               $this->mNewPage = $this->mNewRev->getTitle();
 
                // Load the old revision object
                $this->mOldRev = false;