From: Platonides <platonides@users.mediawiki.org>
Date: Mon, 23 Aug 2010 14:13:41 +0000 (+0000)
Subject: Use the common code at switch end if viewing the current version of a page using... 
X-Git-Tag: 1.31.0-rc.0~35362
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=b747b0dbb132521cb35345c2513ce52231071218;p=lhc%2Fweb%2Fwiklou.git

Use the common code at switch end if viewing the current version of a page using the permalink.
Title related r64876 and r64934 were not applied in that case, nor were they getting their
getRobotPolicy(), like other old revisions (noindex,nofollow).
---

diff --git a/includes/Article.php b/includes/Article.php
index 6492129de7..dc9d5d559f 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -962,13 +962,11 @@ class Article {
 						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" );
+								wfDebug( __METHOD__ . ": showing parser cache for current rev permalink\n" );								
 								$wgOut->addParserOutput( $this->mParserOutput );
 								$wgOut->setRevisionId( $this->mLatest );
-								$this->showViewFooter();
-								$this->viewUpdates();
-								wfProfileOut( __METHOD__ );
-								return;
+								$outputDone = true;
+								break;								
 							}
 						}
 					}