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 c7b257a..cfa26b0 100644 (file)
--- 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 );