Index: t3lib/class.t3lib_stdgraphic.php =================================================================== --- t3lib/class.t3lib_stdgraphic.php (revision 6109) +++ t3lib/class.t3lib_stdgraphic.php (working copy) @@ -2557,17 +2557,16 @@ } /** - * Wrapping the input filename in double-quotes + * Escapes a file name so it can safely be used on the command line. * - * @param string Input filename - * @return string The output wrapped in "" (if there are spaces in the filepath) - * @access private + * @param string $inputName filename to safeguard, must not be empty + * + * @return string $inputName escaped as needed + * + * @access protected */ - function wrapFileName($inputName) { - if (strstr($inputName,' ')) { - $inputName='"'.$inputName.'"'; - } - return $inputName; + function wrapFileName($inputName) { + return escapeshellarg($inputName); }