mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-05 01:12:29 +02:00
fixes #2462 magick Vs convert: return only command name, not full path
This commit is contained in:
@@ -380,11 +380,11 @@ class pwg_image
|
|||||||
exec('command -v '.$conf['ext_imagick_dir'].'magick', $cmd_out , $retval );
|
exec('command -v '.$conf['ext_imagick_dir'].'magick', $cmd_out , $retval );
|
||||||
if (0 == $retval)
|
if (0 == $retval)
|
||||||
{
|
{
|
||||||
$page['ext_imagick_command'] = $cmd_out[0];
|
$page['ext_imagick_command'] = 'magick';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$page['ext_imagick_command'] = $conf['ext_imagick_dir'].'convert';
|
$page['ext_imagick_command'] = 'convert';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user