Merge "Add attributes parameter to ShowSearchHitTitle"

[lhc/web/wiklou.git] / includes / revisiondelete / RevDelFileList.php

diff --git a/includes/revisiondelete/RevDelFileList.php b/includes/revisiondelete/RevDelFileList.php
index e5f32d2..6a6b86c 100644 (file)
--- a/includes/revisiondelete/RevDelFileList.php
+++ b/includes/revisiondelete/RevDelFileList.php
@@ -19,6 +19,8 @@
  * @ingroup RevisionDelete
  */
 
+use Wikimedia\Rdbms\IDatabase;
+
 /**
  * List for oldimage table items
  */
@@ -53,20 +55,22 @@ class RevDelFileList extends RevDelList {
         * @return mixed
         */
        public function doQuery( $db ) {
-               $archiveNames = array();
+               $archiveNames = [];
                foreach ( $this->ids as $timestamp ) {
                        $archiveNames[] = $timestamp . '!' . $this->title->getDBkey();
                }
 
+               $oiQuery = OldLocalFile::getQueryInfo();
                return $db->select(
-                       'oldimage',
-                       OldLocalFile::selectFields(),
-                       array(
+                       $oiQuery['tables'],
+                       $oiQuery['fields'],
+                       [
                                'oi_name' => $this->title->getDBkey(),
                                'oi_archive_name' => $archiveNames
-                       ),
+                       ],
                        __METHOD__,
-                       array( 'ORDER BY' => 'oi_timestamp DESC' )
+                       [ 'ORDER BY' => 'oi_timestamp DESC' ],
+                       $oiQuery['joins']
                );
        }
 
@@ -75,9 +79,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 +108,20 @@ class RevDelFileList extends RevDelList {
                return $status;
        }
 
-       public function doPostCommitUpdates() {
+       public function doPostCommitUpdates( array $visibilityChangeMap ) {
                $file = wfLocalFile( $this->title );
                $file->purgeCache();
                $file->purgeDescription();
 
                // Purge full images from cache
-               $purgeUrls = array();
+               $purgeUrls = [];
                foreach ( $this->ids as $timestamp ) {
                        $archiveName = $timestamp . '!' . $this->title->getDBkey();
                        $file->purgeOldThumbnails( $archiveName );
                        $purgeUrls[] = $file->getArchiveUrl( $archiveName );
                }
                DeferredUpdates::addUpdate(
-                       new SquidUpdate( $purgeUrls ),
+                       new CdnCacheUpdate( $purgeUrls ),
                        DeferredUpdates::PRESEND
                );