Minor tweaks to r74232, add a value for $botMax on calls for integer validation ...

[lhc/web/wiklou.git] / includes / media / SVG.php

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index f0519e8..242b264 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -1,10 +1,14 @@
 <?php
 /**
+ * Handler for SVG images.
+ *
  * @file
  * @ingroup Media
  */
 
 /**
+ * Handler for SVG images.
+ *
  * @ingroup Media
  */
 class SvgHandler extends ImageHandler {
@@ -40,8 +44,6 @@ class SvgHandler extends ImageHandler {
        }
 
        function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
-               global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath;
-
                if ( !$this->normaliseParams( $image, $params ) ) {
                        return new TransformParameterError( $params );
                }
@@ -80,6 +82,7 @@ class SvgHandler extends ImageHandler {
        public function rasterize( $srcPath, $dstPath, $width, $height ) {
                global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath;
                $err = false;
+               $retval = '';
                if ( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
                        $cmd = str_replace(
                                array( '$path/', '$width', '$height', '$input', '$output' ),
@@ -108,7 +111,7 @@ class SvgHandler extends ImageHandler {
                return wfGetSVGsize( $path );
        }
 
-       function getThumbType( $ext, $mime ) {
+       function getThumbType( $ext, $mime, $params = null ) {
                return array( 'png', 'image/png' );
        }