* (bug 14117) Image redirects from the shared repo now show "redirected from"

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 32cd5ae..234e5c9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -460,6 +460,7 @@ 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"
 
 === API changes in 1.14 ===
 

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index aa5295e..870d7c3 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -107,6 +107,11 @@ 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