X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=thumb.php;h=2ea3f0761ff48e9c2cf8444aeffe61ff9d4a5718;hb=b89c0e7d9848d3a5396e668dae8716cb5ba943f1;hp=70cd1e67af1d4178a629bd28c540d694320a4545;hpb=b3fb5933dd6a616006a001e589e478e8936dc43c;p=lhc%2Fweb%2Fwiklou.git diff --git a/thumb.php b/thumb.php index 70cd1e67af..2ea3f0761f 100644 --- a/thumb.php +++ b/thumb.php @@ -305,7 +305,10 @@ function wfStreamThumb( array $params ) { // Stream the file if it exists already... $thumbPath = $img->getThumbPath( $thumbName ); if ( $img->getRepo()->fileExists( $thumbPath ) ) { - $img->getRepo()->streamFile( $thumbPath, $headers ); + $success = $img->getRepo()->streamFile( $thumbPath, $headers ); + if ( !$success ) { + wfThumbError( 500, 'Could not stream the file' ); + } return; } @@ -320,6 +323,7 @@ function wfStreamThumb( array $params ) { // Actually generate a new thumbnail list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath ); + /** @var MediaTransformOutput|bool $thumb */ // Check for thumbnail generation errors... $msg = wfMessage( 'thumbnail_error' ); @@ -340,7 +344,10 @@ function wfStreamThumb( array $params ) { wfThumbError( $errorCode, $errorMsg ); } else { // Stream the file if there were no errors - $thumb->streamFile( $headers ); + $success = $thumb->streamFile( $headers ); + if ( !$success ) { + wfThumbError( 500, 'Could not stream the file' ); + } } }