From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 14 Mar 2012 16:04:21 +0000 (+0000)
Subject: * (bug 34841) Fix for r103502: don't show edit links when display old page versions
X-Git-Tag: 1.31.0-rc.0~24259
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=6cc0e69e7491dbcd8b11c0b8ebcded0b43dba62a;p=lhc%2Fweb%2Fwiklou.git

* (bug 34841) Fix for r103502: don't show edit links when display old page versions
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 32199f5784..c9db5c173b 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -18,6 +18,7 @@ production.
 * (bug 35152) Help message for e-mail is shown again in user preferences
 * (bug 34887) $3 and $4 parameters are now substituted correctly in message
   "movepage-moved"
+* (bug 34841) Edit links are no longer displayed when display old page versions
 
 === Configuration changes in 1.19 ===
 * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
diff --git a/includes/Article.php b/includes/Article.php
index d98fc1e55f..393f770bf7 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -455,7 +455,7 @@ class Article extends Page {
 		if ( $wgOut->isPrintable() ) {
 			$parserOptions->setIsPrintable( true );
 			$parserOptions->setEditSection( false );
-		} elseif ( !$this->getTitle()->quickUserCan( 'edit' ) ) {
+		} elseif ( !$this->isCurrent() || !$this->getTitle()->quickUserCan( 'edit' ) ) {
 			$parserOptions->setEditSection( false );
 		}