Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed commented-out migrateThumbFile() code

Browse source 
Change-Id: Ic52d3a8d93808b365c3f06fef9e51d65efcd1d57
This commit is contained in:
Aaron Schulz 2014-04-30 00:30:37 -07:00
parent 06db1a2335
commit 250b23aa01
2 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/filerepo/file/File.php
View file

@ -989,8 +989,6 @@ abstract class File {
$thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); $thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
break; break;
} }
// Clean up broken thumbnails as needed
$this->migrateThumbFile( $thumbName );
// Check if an up-to-date thumbnail already exists... // Check if an up-to-date thumbnail already exists...
wfDebug( __METHOD__ . ": Doing stat for $thumbPath\n" ); wfDebug( __METHOD__ . ": Doing stat for $thumbPath\n" );
if ( !( $flags & self::RENDER_FORCE ) && $this->repo->fileExists( $thumbPath ) ) { if ( !( $flags & self::RENDER_FORCE ) && $this->repo->fileExists( $thumbPath ) ) {

35
includes/filerepo/file/LocalFile.php
View file

@ -822,41 +822,6 @@ class LocalFile extends File {
/** createThumb inherited */ /** createThumb inherited */
/** transform inherited */ /** transform inherited */
/**
* Fix thumbnail files from 1.4 or before, with extreme prejudice
* @todo Do we still care about this? Perhaps a maintenance script
* can be made instead. Enabling this code results in a serious
* RTT regression for wikis without 404 handling.
*
* @param string $thumbName
*/
function migrateThumbFile( $thumbName ) {
/* Old code for bug 2532
$thumbDir = $this->getThumbPath();
$thumbPath = "$thumbDir/$thumbName";
if ( is_dir( $thumbPath ) ) {
// Directory where file should be
// This happened occasionally due to broken migration code in 1.5
// Rename to broken-*
for ( $i = 0; $i < 100; $i++ ) {
$broken = $this->repo->getZonePath( 'public' ) . "/broken-$i-$thumbName";
if ( !file_exists( $broken ) ) {
rename( $thumbPath, $broken );
break;
}
}
// Doesn't exist anymore
clearstatcache();
}
*/
/*
if ( $this->repo->fileExists( $thumbDir ) ) {
// Delete file where directory should be
$this->repo->cleanupBatch( array( $thumbDir ) );
}
*/
}
/** getHandler inherited */ /** getHandler inherited */
/** iconThumb inherited */ /** iconThumb inherited */
/** getLastError inherited */ /** getLastError inherited */