r96657 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96656‎ | r96657 | r96658 >
Date:12:14, 9 September 2011
Author:reedy
Status:ok
Tags:
Comment:
Revert r84395 out of 1.18

Leaving in trunk (for the time being at least). If this is needed for the TMH deployment, it can be merged into 1.18wmf1 as a temporary stopgap
Modified paths:
  • /branches/REL1_18/phase3/includes/DefaultSettings.php (modified) (history)
  • /branches/REL1_18/phase3/includes/filerepo/LocalFile.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/includes/filerepo/LocalFile.php
@@ -678,7 +678,7 @@
679679 * Delete cached transformed files
680680 */
681681 function purgeThumbnails() {
682 - global $wgUseSquid, $wgExcludeFromThumbnailPurge;
 682+ global $wgUseSquid;
683683
684684 // Delete thumbnails
685685 $files = $this->getThumbnails();
@@ -686,12 +686,6 @@
687687 $urls = array();
688688
689689 foreach ( $files as $file ) {
690 - // Only remove files not in the $wgExcludeFromThumbnailPurge configuration variable
691 - $ext = pathinfo( "$dir/$file", PATHINFO_EXTENSION );
692 - if ( in_array( $ext, $wgExcludeFromThumbnailPurge ) ) {
693 - continue;
694 - }
695 -
696690 # Check that the base file name is part of the thumb name
697691 # This is a basic sanity check to avoid erasing unrelated directories
698692 if ( strpos( $file, $this->getName() ) !== false ) {
Index: branches/REL1_18/phase3/includes/DefaultSettings.php
@@ -4718,13 +4718,6 @@
47194719 );
47204720
47214721 /**
4722 - * Extensions of "thumbnails" that are very expensive to regenerate and should be
4723 - * excluded from normal action=purge thumbnail removal.
4724 - */
4725 -$wgExcludeFromThumbnailPurge = array();
4726 -
4727 -/**
4728 -
47294722 * Jobs that must be explicitly requested, i.e. aren't run by job runners unless special flags are set.
47304723 *
47314724 * These can be:

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r84395(bug 27641) purgeThumbnails should support exclusion of expensive files. Add ...catrope16:38, 20 March 2011

Status & tagging log