https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113816
Revision: 113816
Author: ialex
Date: 2012-03-14 16:04:21 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
* (bug 34841) Fix for r103502: don't show edit links when display old page
versions
Modified Paths:
--------------
branches/REL1_19/phase3/RELEASE-NOTES-1.19
branches/REL1_19/phase3/includes/Article.php
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/Article.php
Modified: branches/REL1_19/phase3/RELEASE-NOTES-1.19
===================================================================
--- branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-14 16:00:17 UTC (rev
113815)
+++ branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-14 16:04:21 UTC (rev
113816)
@@ -18,6 +18,7 @@
* (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.
Modified: branches/REL1_19/phase3/includes/Article.php
===================================================================
--- branches/REL1_19/phase3/includes/Article.php 2012-03-14 16:00:17 UTC
(rev 113815)
+++ branches/REL1_19/phase3/includes/Article.php 2012-03-14 16:04:21 UTC
(rev 113816)
@@ -451,7 +451,7 @@
if ( $wgOut->isPrintable() ) {
$parserOptions->setIsPrintable( true );
$parserOptions->setEditSection( false );
- } elseif ( !$this->getTitle()->quickUserCan( 'edit' ) ) {
+ } elseif ( !$this->isCurrent() ||
!$this->getTitle()->quickUserCan( 'edit' ) ) {
$parserOptions->setEditSection( false );
}
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2012-03-14 16:00:17 UTC (rev 113815)
+++ trunk/phase3/RELEASE-NOTES-1.19 2012-03-14 16:04:21 UTC (rev 113816)
@@ -18,6 +18,7 @@
* (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.
Modified: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php 2012-03-14 16:00:17 UTC (rev 113815)
+++ trunk/phase3/includes/Article.php 2012-03-14 16:04:21 UTC (rev 113816)
@@ -455,7 +455,7 @@
if ( $wgOut->isPrintable() ) {
$parserOptions->setIsPrintable( true );
$parserOptions->setEditSection( false );
- } elseif ( !$this->getTitle()->quickUserCan( 'edit' ) ) {
+ } elseif ( !$this->isCurrent() ||
!$this->getTitle()->quickUserCan( 'edit' ) ) {
$parserOptions->setEditSection( false );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
