mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 00:18:26 +00:00
28 lines
969 B
Diff
28 lines
969 B
Diff
From 66f0ef574d2aac24b4a4b969f2df71003a2c2a8a Mon Sep 17 00:00:00 2001
|
|
From: plegall <plg@piwigo.org>
|
|
Date: Mon, 1 Dec 2025 15:07:40 +0100
|
|
Subject: [PATCH] fixes #2462 magick Vs convert: return only command name, not
|
|
full path
|
|
|
|
---
|
|
admin/include/image.class.php | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
|
|
index 2b1119e3f5..67718acf2c 100644
|
|
--- a/admin/include/image.class.php
|
|
+++ b/admin/include/image.class.php
|
|
@@ -380,11 +380,11 @@ static function get_ext_imagick_command()
|
|
exec('command -v '.$conf['ext_imagick_dir'].'magick', $cmd_out , $retval );
|
|
if (0 == $retval)
|
|
{
|
|
- $page['ext_imagick_command'] = $cmd_out[0];
|
|
+ $page['ext_imagick_command'] = 'magick';
|
|
}
|
|
else
|
|
{
|
|
- $page['ext_imagick_command'] = $conf['ext_imagick_dir'].'convert';
|
|
+ $page['ext_imagick_command'] = 'convert';
|
|
}
|
|
}
|
|
|