Use redirect=no on redirects listed in file links.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 00a1afc..c430c3d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -379,6 +379,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13878) Deprecate Article::getDB() in favor of direct wfGetDB() calls
 * (bug 4977) Fix for possible squid purging errors when using HTTP purges
   and multiple servers
+* (bug 14572) Redirects listed on file links on image pages no longer redirect.
 
 === API changes in 1.13 ===
 

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index d32feee..5d4db92 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -685,7 +685,7 @@ EOT
 
                $sk = $wgUser->getSkin();
                foreach ( $redirects as $title ) {
-                       $link = $sk->makeKnownLinkObj( $title, "" );
+                       $link = $sk->makeKnownLinkObj( $title, "", "redirect=no" );
                        $wgOut->addHTML( "<li>{$link}</li>\n" );
                }
                $wgOut->addHTML( "</ul></div>\n" );