| Index: trunk/phase3/includes/Image.php |
| — | — | @@ -927,15 +927,15 @@ |
| 928 | 928 | |
| 929 | 929 | $this->migrateThumbFile( $thumbName ); |
| 930 | 930 | |
| 931 | | - if ( file_exists( $thumbPath ) ) { |
| | 931 | + if ( !$wgGenerateThumbnailOnParse && !($flags & self::RENDER_NOW ) ) { |
| 932 | 932 | $thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); |
| 933 | 933 | break; |
| 934 | 934 | } |
| 935 | | - |
| 936 | | - if ( !$wgGenerateThumbnailOnParse && !($flags & self::RENDER_NOW ) ) { |
| | 935 | + if ( file_exists( $thumbPath ) ) { |
| 937 | 936 | $thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); |
| 938 | 937 | break; |
| 939 | 938 | } |
| | 939 | + |
| 940 | 940 | $thumb = $handler->doTransform( $this, $thumbPath, $thumbUrl, $params ); |
| 941 | 941 | |
| 942 | 942 | // Ignore errors if requested |