follow-up r98710/r104410. I personally think that forRefresh is confusing, since...

diff --git a/includes/WikiFilePage.php b/includes/WikiFilePage.php
index e2096b3..8aeaa24 100644 (file)
--- 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 b857c8e..9d18f1b 100644 (file)
--- 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 653caa9..69dc029 100644 (file)
--- 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 );