(bug 4362) [[MediaWiki:History copyright]] no more used with most recent revision...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7995679..65173e3 100644 (file)
--- 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 b0e0c48..f5c80c9 100644 (file)
--- 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';