From 02e48817da24f9065156bee7879e17f1f581b6ce Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Fri, 30 Jan 2009 19:59:38 +0000 Subject: [PATCH] Handle this todo: Allow local redirects to foreign images to be displayed on the local wiki. We already store this data in the redirect table anyway. --- RELEASE-NOTES | 2 ++ includes/ImagePage.php | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index fcdd6bceaf..b83ba4def8 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -71,6 +71,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN can now be determined and set with ParserOptions. * Wrap message 'confirmemail_pending' into a div with CSS classes "error" and "mw-confirmemail-pending" +* Local redirects to foreign images are now displayed on the ImagePage when + viewing on the local wiki. === Bug fixes in 1.15 === * (bug 16968) Special:Upload no longer throws useless warnings. diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 1aba85e471..aea40a9981 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -129,11 +129,7 @@ class ImagePage extends Article { array( 'id' => 'filelinks' ), wfMsg( 'imagelinks' ) ) . "\n" ); $this->imageDupes(); - // TODO: We may want to find local images redirecting to a foreign - // file: "The following local files redirect to this file" - if( $this->img->isLocal() ) { - $this->imageRedirects(); - } + $this->imageRedirects(); $this->imageLinks(); if( $showmeta ) { -- 2.20.1