https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112616
Revision: 112616
Author: aaron
Date: 2012-02-28 17:37:37 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Ported r112615 from 1.19wmf:
* Fixed stupid bug in r112613 where the var was defined only for the vips code
branch.
* Removed is_file() check since a temp file is always there and File/thumb.php
is supposed to handle this kind of check anyway.
Modified Paths:
--------------
trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php
===================================================================
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php 2012-02-28
17:34:27 UTC (rev 112615)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php 2012-02-28
17:37:37 UTC (rev 112616)
@@ -312,14 +312,12 @@
return $this->doThumbError( $params, $error );
}
- if ( is_file( $dstPath ) ) {
- return new ThumbnailImage( $image, $dstUrl, $width,
- $height, $dstPath, $page );
- }
-
if ( !wfMkdirParents( dirname( $dstPath ), null, __METHOD__ ) )
return $this->doThumbError( $params,
'thumbnail_dest_directory' );
+ // Get local copy source for shell scripts
+ $srcPath = $image->getLocalRefPath();
+
if ( $wgTiffUseVips ) {
$pagesize = PagedTiffImage::getPageSize($meta, $page);
if ( !$pagesize ) {
@@ -332,9 +330,6 @@
if ( ( $width * $height ) > $wgMaxImageAreaForVips )
return $this->doThumbError( $params,
'tiff_targetfile_too_large' );
- // Get local copy source for shell scripts
- $srcPath = $image->getLocalRefPath();
-
// Shrink factors must be > 1.
if ( ( $pagesize['width'] > $width ) && (
$pagesize['height'] > $height ) ) {
$xfac = $pagesize['width'] / $width;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
