From: Siebrand Mazeland Date: Wed, 23 Jun 2010 18:18:14 +0000 (+0000) Subject: Follow-up r68409: shut up PHP Strict Standards notices about "Declaration of Blah... X-Git-Tag: 1.31.0-rc.0~36409 X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=edb092b11093969bc5f2a0d6bd7e8346decb18a6;p=lhc%2Fweb%2Fwiklou.git Follow-up r68409: shut up PHP Strict Standards notices about "Declaration of Blah::getThumbType() should be compatible with that of MediaHandler::getThumbType()" --- diff --git a/includes/media/BMP.php b/includes/media/BMP.php index 39b297445b..89c763a729 100644 --- a/includes/media/BMP.php +++ b/includes/media/BMP.php @@ -17,7 +17,7 @@ class BmpHandler extends BitmapHandler { } // Render files as PNG - function getThumbType( $text, $mime ) { + function getThumbType( $text, $mime, $params = null ) { return array( 'png', 'image/png' ); } diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index 38c16c21fb..0812ae5fc5 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -181,7 +181,7 @@ class DjVuHandler extends ImageHandler { return $this->getDjVuImage( $image, $path )->getImageSize(); } - function getThumbType( $ext, $mime ) { + function getThumbType( $ext, $mime, $params = null ) { global $wgDjvuOutputExtension; static $mime; if ( !isset( $mime ) ) { diff --git a/includes/media/SVG.php b/includes/media/SVG.php index 4cc66fb1c7..69a36f31e6 100644 --- a/includes/media/SVG.php +++ b/includes/media/SVG.php @@ -106,7 +106,7 @@ class SvgHandler extends ImageHandler { return wfGetSVGsize( $path ); } - function getThumbType( $ext, $mime ) { + function getThumbType( $ext, $mime, $params = null ) { return array( 'png', 'image/png' ); } diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php index 9d3fbb785f..859595b585 100644 --- a/includes/media/Tiff.php +++ b/includes/media/Tiff.php @@ -26,7 +26,7 @@ class TiffHandler extends BitmapHandler { return true; } - function getThumbType( $ext, $mime ) { + function getThumbType( $ext, $mime, $params = null ) { global $wgTiffThumbnailType; return $wgTiffThumbnailType; }