jenkins-bot has submitted this change and it was merged.
Change subject: Execute LocalFilePurgeThumbnails hook before purging thumbnails
......................................................................
Execute LocalFilePurgeThumbnails hook before purging thumbnails
bug: 62273
Change-Id: I08ae902debb36039d2c0be829eec07a109e70a24
---
M includes/filerepo/file/LocalFile.php
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index c7b257a..cfa26b0 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -903,11 +903,12 @@
// 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 ) {
@@ -947,12 +948,12 @@
}
}
- $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 );
--
To view, visit https://gerrit.wikimedia.org/r/118424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08ae902debb36039d2c0be829eec07a109e70a24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prod <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
