From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 30 Jan 2009 19:59:38 +0000 (+0000)
Subject: Handle this todo: Allow local redirects to foreign images to be displayed on the... 
X-Git-Tag: 1.31.0-rc.0~43116
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=02e48817da24f9065156bee7879e17f1f581b6ce;p=lhc%2Fweb%2Fwiklou.git

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.
---

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 ) {