From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 31 Dec 2008 22:06:22 +0000 (+0000)
Subject: Revert r45191 "* (bug 14117) Image redirects from the shared repo now show "redirecte... 
X-Git-Tag: 1.31.0-rc.0~43652
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=4164ab50d89c553c76f9765931efcaf1391e081d;p=lhc%2Fweb%2Fwiklou.git

Revert r45191 "* (bug 14117) Image redirects from the shared repo now show "redirected from""
Seems to be bizarrely adding a "redirected from" subtitle to *every* shared image page view, instead of to redirects. WTF?
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b1a48c29f2..46642dc123 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -461,7 +461,6 @@ The following extensions are migrated into MediaWiki 1.14:
   file extension (e.g. Foo. jpg).
 * Ensure that all HTML id's begin with a letter as required by XHTML standard
 * Image moving over an existing file no longer throws a database error
-* (bug 14117) Image redirects from the shared repo now show "redirected from"
 * (bug 16786) Restored "redundant" links recently removed from Classic sidebar
 
 
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 870d7c3338..aa5295e28b 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -107,11 +107,6 @@ class ImagePage extends Article {
 			$wgOut->setRobotPolicy( 'noindex,nofollow' );
 			$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
 			$this->viewUpdates();
-
-			# And also show "redirected from" message
-			$sk = $wgUser->getSkin();
-			$redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
-			$wgOut->setSubtitle( wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ) );
 		}
 
 		# Show shared description, if needed