http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96657
Revision: 96657
Author: reedy
Date: 2011-09-09 12:14:33 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
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
branches/REL1_18/phase3/includes/filerepo/LocalFile.php
Modified: branches/REL1_18/phase3/includes/DefaultSettings.php
===================================================================
--- branches/REL1_18/phase3/includes/DefaultSettings.php 2011-09-09
11:32:02 UTC (rev 96656)
+++ branches/REL1_18/phase3/includes/DefaultSettings.php 2011-09-09
12:14:33 UTC (rev 96657)
@@ -4718,13 +4718,6 @@
);
/**
- * Extensions of "thumbnails" that are very expensive to regenerate and should
be
- * excluded from normal action=purge thumbnail removal.
- */
-$wgExcludeFromThumbnailPurge = array();
-
-/**
-
* Jobs that must be explicitly requested, i.e. aren't run by job runners
unless special flags are set.
*
* These can be:
Modified: branches/REL1_18/phase3/includes/filerepo/LocalFile.php
===================================================================
--- branches/REL1_18/phase3/includes/filerepo/LocalFile.php 2011-09-09
11:32:02 UTC (rev 96656)
+++ branches/REL1_18/phase3/includes/filerepo/LocalFile.php 2011-09-09
12:14:33 UTC (rev 96657)
@@ -678,7 +678,7 @@
* Delete cached transformed files
*/
function purgeThumbnails() {
- global $wgUseSquid, $wgExcludeFromThumbnailPurge;
+ global $wgUseSquid;
// Delete thumbnails
$files = $this->getThumbnails();
@@ -686,12 +686,6 @@
$urls = array();
foreach ( $files as $file ) {
- // Only remove files not in the
$wgExcludeFromThumbnailPurge configuration variable
- $ext = pathinfo( "$dir/$file", PATHINFO_EXTENSION );
- if ( in_array( $ext, $wgExcludeFromThumbnailPurge ) ) {
- continue;
- }
-
# Check that the base file name is part of the thumb
name
# This is a basic sanity check to avoid erasing
unrelated directories
if ( strpos( $file, $this->getName() ) !== false ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
