From bf31a123dbf600a350c0fde8a952fa146d4be43f Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 8 Jan 2011 20:07:18 +0000
Subject: [PATCH] Only set $mUser, $mUserText, $mComment and $mTimestamp fields
 in fetchContent() if we have loaded the latests revision

---
 includes/Article.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 8df256a138..8956bc4282 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -551,10 +551,9 @@ class Article {
 		// We should instead work with the Revision object when we need it...
 		$this->mContent   = $revision->getText( Revision::FOR_THIS_USER ); // Loads if user is allowed
 
-		$this->mUser      = $revision->getUser();
-		$this->mUserText  = $revision->getUserText();
-		$this->mComment   = $revision->getComment();
-		$this->mTimestamp = wfTimestamp( TS_MW, $revision->getTimestamp() );
+		if ( $revision->getId() == $this->mLatest ) {
+			$this->setLastEdit( $revision );
+		}
 
 		$this->mRevIdFetched = $revision->getId();
 		$this->mContentLoaded = true;
@@ -705,17 +704,25 @@ class Article {
 			return;
 		}
 
-		$this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
-		if ( !is_null( $this->mLastRevision ) ) {
-			$this->mUser      = $this->mLastRevision->getUser();
-			$this->mUserText  = $this->mLastRevision->getUserText();
-			$this->mTimestamp = $this->mLastRevision->getTimestamp();
-			$this->mComment   = $this->mLastRevision->getComment();
-			$this->mMinorEdit = $this->mLastRevision->isMinor();
-			$this->mRevIdFetched = $this->mLastRevision->getId();
+		$revision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
+		if ( !is_null( $revision ) ) {
+			$this->setLastEdit( $revision );
 		}
 	}
 
+	/**
+	 * Set the lastest revision
+	 */
+	protected function setLastEdit( Revision $revision ) {
+		$this->mLastRevision = $revision;
+		$this->mUser = $revision->getUser();
+		$this->mUserText = $revision->getUserText();
+		$this->mTimestamp = $revision->getTimestamp();
+		$this->mComment = $revision->getComment();
+		$this->mMinorEdit = $revision->isMinor();
+		$this->mRevIdFetched = $revision->getId();
+	}
+
 	/**
 	 * @return string GMT timestamp of last article revision
 	 **/
-- 
2.20.1