Merge "Move some LocalFile comments around"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 Mar 2016 15:55:42 +0000 (15:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 14 Mar 2016 15:55:42 +0000 (15:55 +0000)
includes/filerepo/file/LocalFile.php

index 0a3ded7..29b5891 100644 (file)
@@ -915,6 +915,7 @@ class LocalFile extends File {
                // Purge any custom thumbnail caches
                Hooks::run( 'LocalFilePurgeThumbnails', [ $this, $archiveName ] );
 
+               // Delete thumbnails
                $dir = array_shift( $files );
                $this->purgeThumbList( $dir, $files );
 
@@ -931,7 +932,6 @@ class LocalFile extends File {
         * @param array $options
         */
        public function purgeThumbnails( $options = [] ) {
-               // Delete thumbnails
                $files = $this->getThumbnails();
                // Always purge all files from CDN regardless of handler filters
                $urls = [];
@@ -951,6 +951,7 @@ class LocalFile extends File {
                // Purge any custom thumbnail caches
                Hooks::run( 'LocalFilePurgeThumbnails', [ $this, false ] );
 
+               // Delete thumbnails
                $dir = array_shift( $files );
                $this->purgeThumbList( $dir, $files );