r110355 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110354‎ | r110355 | r110356 >
Date:01:59, 31 January 2012
Author:aaron
Status:ok
Tags:
Comment:
Manually merged in LocalFilePurgeThumbnails hook for use by initial swift deployment
Modified paths:
  • /branches/wmf/1.18wmf1/includes/filerepo/LocalFile.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/includes/filerepo/LocalFile.php
@@ -696,6 +696,9 @@
697697 $dir = array_shift( $files );
698698 $this->purgeThumbList( $dir, $files );
699699
 700+ // Purge any custom thumbnail caches
 701+ wfRunHooks( 'LocalFilePurgeThumbnails', array( $this, $archiveName ) );
 702+
700703 // Directory should be empty, delete it too. This will probably suck on
701704 // something like NFS or if the directory isn't actually empty, so hide
702705 // the warnings :D
@@ -726,6 +729,9 @@
727730 $dir = array_shift( $files );
728731 $this->purgeThumbList( $dir, $files );
729732
 733+ // Purge any custom thumbnail caches
 734+ wfRunHooks( 'LocalFilePurgeThumbnails', array( $this, false ) );
 735+
730736 // Purge the squid
731737 if ( $wgUseSquid ) {
732738 $urls = array();

Status & tagging log