When displaying non-local File pages, add link rel=canonical.

Solves bug 25960

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5d4f669..315ca09 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -204,6 +204,8 @@ LocalSettings.php. The specific bugs are listed below in the general notes.
 * (bug 22463) Add hook 'SkinGetPoweredBy' to make 'powered by' icon/text
   customizable
 * Added CSS print pagination to the print stylesheets
+* (bug 25960) Add <link rel=canonical"> for File pages of shared/foreign
+  file repositories.
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index c12d5dd..04ed3ce 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -518,6 +518,10 @@ EOT
                $descUrl = $this->img->getDescriptionUrl();
                $descText = $this->img->getDescriptionText();
 
+               if( $descUrl ) {
+                       $wgOut->addLink( array( 'rel' => 'canonical', 'href' => $descUrl ) );
+               }
+
                $wrap = "<div class=\"sharedUploadNotice\">\n$1\n</div>\n";
                $repo = $this->img->getRepo()->getDisplayName();