From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 15 Dec 2009 03:22:19 +0000 (+0000)
Subject: Merged r56745 from wmf-deployment, with an adjusted comment. Fixes image redirect... 
X-Git-Tag: 1.31.0-rc.0~38532
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=d2dbfd805206ef9b990ffd4f168556d91e84379a;p=lhc%2Fweb%2Fwiklou.git

Merged r56745 from wmf-deployment, with an adjusted comment. Fixes image redirect cache invalidation on move page in a replicated setup.
---

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 1bf1d48923..fbefb3b7d5 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -544,6 +544,13 @@ class MovePageForm {
 			$wgUser->removeWatch( $ot );
 			$wgUser->removeWatch( $nt );
 		}
+		
+		# Re-clear the file redirect cache, which may have been polluted by 
+		# parsing in messages above. See CR r56745.
+		# FIXME: needs a more robust solution inside FileRepo.
+		if( $ot->getNamespace() == NS_FILE ) {
+			RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $ot );
+		}
 	}
 
 	function showLogFragment( $title, &$out ) {