From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 8 Nov 2008 16:09:37 +0000 (+0000)
Subject: (bug 4362) [[MediaWiki:History copyright]] no more used with most recent revision... 
X-Git-Tag: 1.31.0-rc.0~44408
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=04f84fe5347da008f5b9f164fe94ed3af1a4ec27;p=lhc%2Fweb%2Fwiklou.git

(bug 4362) [[MediaWiki:History copyright]] no more used with most recent revision when passing oldid parameter in the url
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7995679aa5..65173e3617 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -321,6 +321,8 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 15544) Non-index entry points cause the "Wiki not set up" message to
   have corrupt URLs
 * (bug 5101) Image from Commons doesn't show up when searched in Wikipedia search box
+* (bug 4362) [[MediaWiki:History copyright]] no more used with most recent
+  revision when passing oldid parameter in the url
 
 === API changes in 1.14 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index b0e0c48906..f5c80c9cf3 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1300,13 +1300,12 @@ END;
 	}
 
 	function getCopyright( $type = 'detect' ) {
-		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest, $wgArticle;
 
 		if ( $type == 'detect' ) {
-			$oldid = $wgRequest->getVal( 'oldid' );
 			$diff = $wgRequest->getVal( 'diff' );
 
-			if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+			if ( is_null( $diff ) && !$wgArticle->isCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
 				$type = 'history';
 			} else {
 				$type = 'normal';