From 34791773f8b3b68a02051590f64b6859a0654567 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Tue, 20 Dec 2011 06:48:05 +0000 Subject: [PATCH] follow-up r98710/r104410. I personally think that forRefresh is confusing, since a purge is always in essence a "refresh"ing operation. change it to forThumbRefresh. --- includes/WikiFilePage.php | 4 ++-- includes/filerepo/file/File.php | 2 +- includes/filerepo/file/LocalFile.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/WikiFilePage.php b/includes/WikiFilePage.php index e2096b3ea7..8aeaa2435b 100644 --- a/includes/WikiFilePage.php +++ b/includes/WikiFilePage.php @@ -156,12 +156,12 @@ class WikiFilePage extends WikiPage { $update = new HTMLCacheUpdate( $this->mTitle, 'imagelinks' ); $update->doUpdate(); $this->mFile->upgradeRow(); - $this->mFile->purgeCache( array( 'forRefresh' => true ) ); + $this->mFile->purgeCache( array( 'forThumbRefresh' => true ) ); } else { wfDebug( 'ImagePage::doPurge no image for ' . $this->mFile->getName() . "; limiting purge to cache only\n" ); // even if the file supposedly doesn't exist, force any cached information // to be updated (in case the cached information is wrong) - $this->mFile->purgeCache( array( 'forRefresh' => true ) ); + $this->mFile->purgeCache( array( 'forThumbRefresh' => true ) ); } return parent::doPurge(); } diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index b857c8e9ee..9d18f1be47 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -923,7 +923,7 @@ abstract class File { * STUB * Overridden by LocalFile * @param $options Array Options, which include: - * 'forRefresh' : The purging is only to refresh thumbnails + * 'forThumbRefresh' : The purging is only to refresh thumbnails */ function purgeCache( $options = array() ) {} diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 653caa9783..69dc0297c2 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -722,7 +722,7 @@ class LocalFile extends File { $files = $this->getThumbnails(); // Give media handler a chance to filter the purge list - if ( !empty( $options['forRefresh'] ) ) { + if ( !empty( $options['forThumbRefresh'] ) ) { $handler = $this->getHandler(); if ( $handler ) { $handler->filterThumbnailPurgeList( $files, $options ); -- 2.20.1