r112613 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112612‎ | r112613 | r112614 >
Date:17:17, 28 February 2012
Author:aaron
Status:resolved
Tags:
Comment:
Use $file->getLocalRefPath() for shell scripts so they get an FS path
Modified paths:
  • /trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php
@@ -300,7 +300,6 @@
301301 // Get params and force width, height and page to be integers
302302 $width = intval( $params['width'] );
303303 $height = intval( $params['height'] );
304 - $srcPath = $image->getPath();
305304 $page = intval( $params['page'] );
306305 $page = $this->adjustPage( $image, $page );
307306
@@ -333,6 +332,9 @@
334333 if ( ( $width * $height ) > $wgMaxImageAreaForVips )
335334 return $this->doThumbError( $params, 'tiff_targetfile_too_large' );
336335
 336+ // Get local copy source for shell scripts
 337+ $srcPath = $image->getLocalRefPath();
 338+
337339 // Shrink factors must be > 1.
338340 if ( ( $pagesize['width'] > $width ) && ( $pagesize['height'] > $height ) ) {
339341 $xfac = $pagesize['width'] / $width;

Follow-up revisions

RevisionCommit summaryAuthorDate
r112614MFT r112613aaron17:19, 28 February 2012
r112616Ported r112615 from 1.19wmf:...aaron17:37, 28 February 2012

Status & tagging log