Revert r61005, r61047 (show copyright message on special pages). Maybe this could...

diff --git a/CREDITS b/CREDITS
index 768ccd1..71ef151 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -84,7 +84,6 @@ following names for their contribution to the product.
 * Jeremy Baron
 * Jidanni
 * Jimmy Xu
-* Jools Wills
 * Karun Dambietz
 * Kim Hyun-Joon
 * liangent

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b091c52..7daff4b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -304,7 +304,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Send new password e-mail in users preference language
 * LanguageConverter now support nested using of manual convert syntax like
   "-{-{}-}-"
-* (bug 16281) Show copyright system message on special pages
 * Upload license preview now uses the API instead of action=ajax
 * (bug 7346) Add <guid> to RSS to avoid duplicates
 * (bug 19996) Added new hooks for Special:Search, which allow to further

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index d2a5781..e9aac0f 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -423,12 +423,18 @@ class SkinTemplate extends Skin {
 
                        $tpl->setRef( 'credits', $this->credits );
 
-               } else {
+               } elseif ( isset( $oldid ) && !isset( $diff ) ) {
                        $tpl->set( 'copyright', $this->getCopyright() );
                        $tpl->set( 'viewcount', false );
                        $tpl->set( 'lastmod', false );
                        $tpl->set( 'credits', false );
                        $tpl->set( 'numberofwatchingusers', false );
+               } else {
+                       $tpl->set( 'copyright', false );
+                       $tpl->set( 'viewcount', false );
+                       $tpl->set( 'lastmod', false );
+                       $tpl->set( 'credits', false );
+                       $tpl->set( 'numberofwatchingusers', false );
                }
                wfProfileOut( __METHOD__ . '-stuff3' );