diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2007-07-18 09:49:48 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2007-07-18 09:49:48 +0200 |
commit | fd12989ef8eab0fc9816decb8bcabccd1d213ee8 (patch) | |
tree | 68b12cc05704f2181a90d69b898f999309a8c036 /includes/Image.php | |
parent | 1a1c15f5da352895fb32daab8550cb3dca8198ac (diff) |
auf 1.10.1 aktualisiert
Diffstat (limited to 'includes/Image.php')
-rw-r--r-- | includes/Image.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/includes/Image.php b/includes/Image.php index 09c2286e..e085936c 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -929,17 +929,19 @@ class Image $thumbPath = wfImageThumbDir( $this->name, $this->fromSharedDirectory ) . "/$thumbName"; $thumbUrl = $this->thumbUrlFromName( $thumbName ); - $this->migrateThumbFile( $thumbName ); - if ( file_exists( $thumbPath ) ) { + if ( !$wgGenerateThumbnailOnParse && !($flags & self::RENDER_NOW ) ) { $thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); break; } - - if ( !$wgGenerateThumbnailOnParse && !($flags & self::RENDER_NOW ) ) { + + wfDebug( "Doing stat for $thumbPath\n" ); + $this->migrateThumbFile( $thumbName ); + if ( file_exists( $thumbPath ) ) { $thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); break; } + $thumb = $handler->doTransform( $this, $thumbPath, $thumbUrl, $params ); // Ignore errors if requested |