From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 3 Jul 2006 13:27:19 +0000 (+0000)
Subject: Fixed fatal error on old image deletion when squid was enabled
X-Git-Tag: 1.31.0-rc.0~56439
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=8e95fd56da0ca96e6687f11f1d2142fab2e5a1a7;p=lhc%2Fweb%2Fwiklou.git

Fixed fatal error on old image deletion when squid was enabled
---

diff --git a/includes/Image.php b/includes/Image.php
index ff21c4a064..10ad0ea707 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1300,6 +1300,7 @@ class Image
 	function purgeDescription() {
 		$page = Title::makeTitle( NS_IMAGE, $this->name );
 		$page->invalidateCache();
+		$page->purgeSquid();
 	}
 	
 	/**
@@ -1807,7 +1808,7 @@ class Image
 	 * @return true on success, false on some kind of failure
 	 */
 	function deleteOld( $archiveName, $reason ) {
-		$fname = __CLASS__ . '::' . __FUNCTION__;
+		$fname = __METHOD__;
 		$transaction = new FSTransaction();
 		$urlArr = array();
 		
@@ -1840,7 +1841,6 @@ class Image
 		if ( $wgUseSquid ) {
 			$urlArr = array(
 				wfImageArchiveUrl( $archiveName ),
-				$page->getInternalURL()
 			);
 			wfPurgeSquidServers( $urlArr );
 		}