X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Frevisiondelete%2FRevDelFileList.php;h=00cb2e147ce47506d9f6328fa6e97179af2253c4;hb=e7be66b4d725c610e6e014b9cb4a755b0749b364;hp=2295eaa106cbe9da13479f50aee045a3d4975a84;hpb=96a8ab6928b3e0be884c33eed8a1febf6fc4c31e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/revisiondelete/RevDelFileList.php b/includes/revisiondelete/RevDelFileList.php index 2295eaa106..00cb2e147c 100644 --- a/includes/revisiondelete/RevDelFileList.php +++ b/includes/revisiondelete/RevDelFileList.php @@ -53,7 +53,7 @@ class RevDelFileList extends RevDelList { * @return mixed */ public function doQuery( $db ) { - $archiveNames = array(); + $archiveNames = []; foreach ( $this->ids as $timestamp ) { $archiveNames[] = $timestamp . '!' . $this->title->getDBkey(); } @@ -61,12 +61,12 @@ class RevDelFileList extends RevDelList { return $db->select( 'oldimage', OldLocalFile::selectFields(), - array( + [ 'oi_name' => $this->title->getDBkey(), 'oi_archive_name' => $archiveNames - ), + ], __METHOD__, - array( 'ORDER BY' => 'oi_timestamp DESC' ) + [ 'ORDER BY' => 'oi_timestamp DESC' ] ); } @@ -75,9 +75,9 @@ class RevDelFileList extends RevDelList { } public function clearFileOps() { - $this->deleteBatch = array(); - $this->storeBatch = array(); - $this->cleanupBatch = array(); + $this->deleteBatch = []; + $this->storeBatch = []; + $this->cleanupBatch = []; } public function doPreCommitUpdates() { @@ -104,20 +104,22 @@ class RevDelFileList extends RevDelList { return $status; } - public function doPostCommitUpdates() { + public function doPostCommitUpdates( array $visibilityChangeMap ) { $file = wfLocalFile( $this->title ); $file->purgeCache(); $file->purgeDescription(); - $purgeUrls = array(); + + // Purge full images from cache + $purgeUrls = []; foreach ( $this->ids as $timestamp ) { $archiveName = $timestamp . '!' . $this->title->getDBkey(); $file->purgeOldThumbnails( $archiveName ); $purgeUrls[] = $file->getArchiveUrl( $archiveName ); } - if ( $this->getConfig()->get( 'UseSquid' ) ) { - // purge full images from cache - SquidUpdate::purge( $purgeUrls ); - } + DeferredUpdates::addUpdate( + new CdnCacheUpdate( $purgeUrls ), + DeferredUpdates::PRESEND + ); return Status::newGood(); }