From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 6 Sep 2009 08:22:09 +0000 (+0000)
Subject: Fixed regression likely from r55700, where $wgOut rev ID was not set for oldid=latest... 
X-Git-Tag: 1.31.0-rc.0~39900
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=fcf3f35a24505688e9def12c2ee177e03093ed19;p=lhc%2Fweb%2Fwiklou.git

Fixed regression likely from r55700, where $wgOut rev ID was not set for oldid=latest. (this took way too long to track down since the commit summary didn't mention the massive refactoring)
---

diff --git a/includes/Article.php b/includes/Article.php
index beadcdb12d..8f6e33d61c 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -809,7 +809,6 @@ class Article {
 		$outputDone = false;
 		while( !$outputDone && ++$pass ){
 			switch( $pass ){
-
 				case 1:
 					wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$useParserCache ) );
 					break;
@@ -856,12 +855,13 @@ class Article {
 							wfProfileOut( __METHOD__ );
 							return;
 						}
-
+						# If this "old" version is the current, then try the parser cache...
 						if ( $oldid === $this->getLatest() && $this->useParserCache( false ) ) {
 							$this->mParserOutput = $parserCache->get( $this, $parserOptions );
 							if ( $this->mParserOutput ) {
 								wfDebug( __METHOD__.": showing parser cache for current rev permalink\n" );
 								$wgOut->addParserOutput( $this->mParserOutput );
+								$wgOut->setRevisionId( $this->mLatest );
 								$this->showViewFooter();
 								$this->viewUpdates();
 								wfProfileOut( __METHOD__ );