Merge "Add method parameter type documentation"

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

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 28083a7..72a9696 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -177,7 +177,7 @@ class SvgHandler extends ImageHandler {
                                                wfEscapeShellArg( $srcPath ),
                                                wfEscapeShellArg( $dstPath ) ),
                                        $wgSVGConverters[$wgSVGConverter]
-                               ) . " 2>&1";
+                               );
 
                                $env = array();
                                if ( $lang !== false ) {
@@ -186,7 +186,7 @@ class SvgHandler extends ImageHandler {
 
                                wfProfileIn( 'rsvg' );
                                wfDebug( __METHOD__ . ": $cmd\n" );
-                               $err = wfShellExec( $cmd, $retval, $env );
+                               $err = wfShellExecWithStderr( $cmd, $retval, $env );
                                wfProfileOut( 'rsvg' );
                        }
                }
@@ -348,6 +348,7 @@ class SvgHandler extends ImageHandler {
                        'description' => 'imagedescription',
                        'title' => 'objectname',
                );
+               $showMeta = false;
                foreach ( $metadata as $name => $value ) {
                        $tag = strtolower( $name );
                        if ( isset( $conversion[$tag] ) ) {
@@ -356,6 +357,7 @@ class SvgHandler extends ImageHandler {
                                // Do not output other metadata not in list
                                continue;
                        }
+                       $showMeta = true;
                        self::addMeta( $result,
                                in_array( $tag, $visibleFields ) ? 'visible' : 'collapsed',
                                'exif',
@@ -363,7 +365,7 @@ class SvgHandler extends ImageHandler {
                                $value
                        );
                }
-               return $result;
+               return $showMeta ? $result : false;
        }