From: Prod <prodigion@hotmail.com>
Date: Thu, 13 Mar 2014 02:05:51 +0000 (-0400)
Subject: Execute LocalFilePurgeThumbnails hook before purging thumbnails
X-Git-Tag: 1.31.0-rc.0~16614^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=fe019f85688f9ef26ad595cd7b0c8703c7d4424a;p=lhc%2Fweb%2Fwiklou.git

Execute LocalFilePurgeThumbnails hook before purging thumbnails

bug: 62273
Change-Id: I08ae902debb36039d2c0be829eec07a109e70a24
---

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index c7b257a6ba..cfa26b0fed 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -903,12 +903,13 @@ class LocalFile extends File {
 
 		// Get a list of old thumbnails and URLs
 		$files = $this->getThumbnails( $archiveName );
-		$dir = array_shift( $files );
-		$this->purgeThumbList( $dir, $files );
 
 		// Purge any custom thumbnail caches
 		wfRunHooks( 'LocalFilePurgeThumbnails', array( $this, $archiveName ) );
 
+		$dir = array_shift( $files );
+		$this->purgeThumbList( $dir, $files );
+
 		// Purge the squid
 		if ( $wgUseSquid ) {
 			$urls = array();
@@ -947,12 +948,12 @@ class LocalFile extends File {
 			}
 		}
 
-		$dir = array_shift( $files );
-		$this->purgeThumbList( $dir, $files );
-
 		// Purge any custom thumbnail caches
 		wfRunHooks( 'LocalFilePurgeThumbnails', array( $this, false ) );
 
+		$dir = array_shift( $files );
+		$this->purgeThumbList( $dir, $files );
+
 		// Purge the squid
 		if ( $wgUseSquid ) {
 			SquidUpdate::purge( $urls );