Bug #24346 ยป 16755_TYPO3-4.5.0.patch
| typo3_src-4.5.0.new/t3lib/utility/class.t3lib_utility_command.php 2011-02-01 15:26:30.000000000 +0100 | ||
|---|---|---|
|
* @return null|array
|
||
|
*/
|
||
|
public static function exec($command, &$output = NULL, &$returnValue = 0) {
|
||
|
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
|
||
|
$currentLocale = setlocale(LC_CTYPE, 0);
|
||
|
setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
|
||
|
}
|
||
|
$lastLine = exec($command, $output, $returnValue);
|
||
|
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
|
||
|
setlocale(LC_CTYPE, $currentLocale);
|
||
|
}
|
||
|
return $lastLine;
|
||
|
}
|
||
| ... | ... | |
|
}
|
||
|
$path = t3lib_div::fixWindowsFilePath($path);
|
||
|
// fix path containing whitespace (only if safe_mode is off)
|
||
|
if (!t3lib_utility_PhpOptions::isSafeModeEnabled()) {
|
||
|
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
|
||
|
$currentLocale = setlocale(LC_CTYPE, 0);
|
||
|
setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
|
||
|
}
|
||
|
$path = escapeshellarg($path);
|
||
|
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
|
||
|
setlocale(LC_CTYPE, $currentLocale);
|
||
|
}
|
||
|
}
|
||
|
$im_version = strtolower($gfxConf['im_version_5']);
|
||
|
$combineScript = $gfxConf['im_combine_filename'] ? trim($gfxConf['im_combine_filename']) : 'combine';
|
||
| ... | ... | |
|
// Compile the path & command
|
||
|
if ($im_version === 'gm') {
|
||
|
$switchCompositeParameters = TRUE;
|
||
|
$path = escapeshellarg($path . 'gm' . $isExt) . ' ' . $command;
|
||
|
$path = $path . 'gm' . $isExt . ' ' . $command;
|
||
|
} else {
|
||
|
if ($im_version === 'im6') {
|
||
|
$switchCompositeParameters = TRUE;
|
||
|
}
|
||
|
$path = escapeshellarg($path . (($command == 'composite') ? $combineScript : $command) . $isExt);
|
||
|
$path = $path . (($command == 'composite') ? $combineScript : $command) . $isExt;
|
||
|
}
|
||
|
// strip profile information for thumbnails and reduce their size
|
||