From 76a437f58867b1fb9459de09f48a61cbd4982ade Mon Sep 17 00:00:00 2001
From: Magnus Manske <magnusmanske@users.mediawiki.org>
Date: Wed, 11 Jan 2006 09:24:34 +0000
Subject: [PATCH] Image redirect fix back in * "Redirected from" worked before,
 and works now * Fixed "redirect=no"

---
 includes/Wiki.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 7244894cde..81acc7be76 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * MediaWiki is the to-be base class for this whole project
+ */
 
 class MediaWiki {
 
@@ -31,18 +34,24 @@ class MediaWiki {
 				# Reload from the page pointed to later
 				$article->mContentLoaded = false;
 				$ns = $rTitle->getNamespace();
-			}
+				$wasRedirected = true;
+				}
 		}
 
 		// Categories and images are handled by a different class
 		if( $ns == NS_IMAGE ) {
+			$b4 = $title->getPrefixedText();
 			unset( $article );
 			require_once( 'includes/ImagePage.php' );
-			return new ImagePage( $title );
+			$article = new ImagePage( $title );
+			if( isset( $wasRedirected ) && $request->getVal( 'redirect' ) != 'no' ) {
+				$article->mTitle = $rTitle;
+				$article->mRedirectedFrom = $b4;
+			}
 		} elseif( $ns == NS_CATEGORY ) {
 			unset( $article );
 			require_once( 'includes/CategoryPage.php' );
-			return new CategoryPage( $title );
+			$article = new CategoryPage( $title );
 		}
 		return $article;
 	}
-- 
2.20.1