https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112615
Revision: 112615
Author: aaron
Date: 2012-02-28 17:34:27 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Committed live fixes
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php
Modified:
branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php
2012-02-28 17:19:08 UTC (rev 112614)
+++ branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php
2012-02-28 17:34:27 UTC (rev 112615)
@@ -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
