diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-08-12 09:28:15 +0200 |
commit | 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (patch) | |
tree | 577a29fb579188d16003a209ce2a2e9c5b0aa2bd /includes/media/ImageHandler.php | |
parent | cacc939b34e315b85e2d72997811eb6677996cc1 (diff) |
Update to MediaWiki 1.21.1
Diffstat (limited to 'includes/media/ImageHandler.php')
-rw-r--r-- | includes/media/ImageHandler.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php index 61759074..419afeef 100644 --- a/includes/media/ImageHandler.php +++ b/includes/media/ImageHandler.php @@ -139,7 +139,6 @@ abstract class ImageHandler extends MediaHandler { $params['height'] = $params['physicalHeight']; } - if ( !$this->validateThumbParams( $params['physicalWidth'], $params['physicalHeight'], $srcWidth, $srcHeight, $mimeType ) ) { return false; @@ -162,11 +161,11 @@ abstract class ImageHandler extends MediaHandler { # Sanity check $width if( $width <= 0) { - wfDebug( __METHOD__.": Invalid destination width: $width\n" ); + wfDebug( __METHOD__ . ": Invalid destination width: $width\n" ); return false; } if ( $srcWidth <= 0 ) { - wfDebug( __METHOD__.": Invalid source width: $srcWidth\n" ); + wfDebug( __METHOD__ . ": Invalid source width: $srcWidth\n" ); return false; } @@ -188,7 +187,7 @@ abstract class ImageHandler extends MediaHandler { if ( !$this->normaliseParams( $image, $params ) ) { return false; } - $url = $script . '&' . wfArrayToCGI( $this->getScriptParams( $params ) ); + $url = $script . '&' . wfArrayToCgi( $this->getScriptParams( $params ) ); if( $image->mustRender() || $params['width'] < $image->getWidth() ) { return new ThumbnailImage( $image, $url, false, $params ); |