[Wikitech-l] Image.php: passthru instead of shell_exec (1.5b2)

11 Jul 2005

Hi,
why we don't use passthru in Image.php? shell_exec won't run in 
safemode, but passthru (with safe_mode_exec_dir) works great!
Jochen

--- Image_orig.php      2005-07-04 01:08:16.000000000 +0200
+++ Image.php   2005-07-11 00:29:32.000000000 +0200
@@ -991,7 +991,7 @@
                                                    wfEscapeShellArg( 
$this->imagePath ),
                                                    wfEscapeShellArg( 
$thumbPath ) ),
$wgSVGConverters[$wgSVGConverter] );
-                               $conv = shell_exec( $cmd );
+                               $conv = passthru( $cmd );
                         } else {
                                 $conv = false;
                         }
@@ -1004,7 +1004,7 @@
                                 wfEscapeShellArg($this->imagePath) . " " .
                                 wfEscapeShellArg($thumbPath);
                         wfDebug("reallyRenderThumb: running 
ImageMagick: $cmd");
-                       $conv = shell_exec( $cmd );
+                       $conv = passthru( $cmd );
                 } else {
                         # Use PHP's builtin GD library functions.
                         #

    