Followup to r76867. Only add canonical if there is no local page for the shared file.

Bug 25960

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 04ed3ce..a1b204f 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -518,7 +518,8 @@ EOT
                $descUrl = $this->img->getDescriptionUrl();
                $descText = $this->img->getDescriptionText();
 
-               if( $descUrl ) {
+               /* Add canonical to head if there is no local page for this shared file */
+               if( $descUrl && $this->getID() == 0 ) {
                        $wgOut->addLink( array( 'rel' => 'canonical', 'href' => $descUrl ) );
                }