https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112614
Revision: 112614 Author: aaron Date: 2012-02-28 17:19:08 +0000 (Tue, 28 Feb 2012) Log Message: ----------- MFT r112613 Modified Paths: -------------- branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php Property Changed: ---------------- branches/wmf/1.19wmf1/extensions/ Property changes on: branches/wmf/1.19wmf1/extensions ___________________________________________________________________ Modified: svn:mergeinfo - /branches/JSTesting/extensions:100352-107913 /branches/REL1_15/phase3/extensions:51646 /branches/REL1_17/phase3/extensions:81445,81448 /branches/new-installer/phase3/extensions:43664-66004 /branches/sqlite/extensions:58211-58321 /branches/wmf/1.18wmf1/extensions:97508 /trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517 /trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251 + /branches/JSTesting/extensions:100352-107913 /branches/REL1_15/phase3/extensions:51646 /branches/REL1_17/phase3/extensions:81445,81448 /branches/new-installer/phase3/extensions:43664-66004 /branches/sqlite/extensions:58211-58321 /branches/wmf/1.18wmf1/extensions:97508 /trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112613 /trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251 Modified: branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php =================================================================== --- branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php 2012-02-28 17:17:42 UTC (rev 112613) +++ branches/wmf/1.19wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php 2012-02-28 17:19:08 UTC (rev 112614) @@ -300,7 +300,6 @@ // Get params and force width, height and page to be integers $width = intval( $params['width'] ); $height = intval( $params['height'] ); - $srcPath = $image->getPath(); $page = intval( $params['page'] ); $page = $this->adjustPage( $image, $page ); @@ -333,6 +332,9 @@ 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 MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs