jenkins-bot has submitted this change and it was merged.
Change subject: Move some LocalFile comments around
......................................................................
Move some LocalFile comments around
Change-Id: I7d7c5618481245aa6e8328ad58f5e841f010fe01
---
M includes/filerepo/file/LocalFile.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index 0a3ded7..29b5891 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -915,6 +915,7 @@
// Purge any custom thumbnail caches
Hooks::run( 'LocalFilePurgeThumbnails', [ $this, $archiveName ]
);
+ // Delete thumbnails
$dir = array_shift( $files );
$this->purgeThumbList( $dir, $files );
@@ -931,7 +932,6 @@
* @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 @@
// Purge any custom thumbnail caches
Hooks::run( 'LocalFilePurgeThumbnails', [ $this, false ] );
+ // Delete thumbnails
$dir = array_shift( $files );
$this->purgeThumbList( $dir, $files );
--
To view, visit https://gerrit.wikimedia.org/r/276897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d7c5618481245aa6e8328ad58f5e841f010fe01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
