From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sun, 20 Feb 2022 20:17:16 +0000 (+0000)
Subject: Merged r21427 to 4.1-stable (#35027).
X-Git-Tag: 4.1.6~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=496ec260dd1307993c7407b20535c29495fdc612;p=redmine.git

Merged r21427 to 4.1-stable (#35027).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21429 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index dcddcca2a..1223c0fe0 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -379,6 +379,9 @@ module Redmine
           unless Redmine::Configuration['rmagick_font_path'].nil?
         font_path = Redmine::Configuration['minimagick_font_path'].presence || Redmine::Configuration['rmagick_font_path'].presence
         img = MiniMagick::Image.create(".#{format}", false)
+        if Redmine::Configuration['imagemagick_convert_command'].present?
+          MiniMagick.cli_path = File.dirname(Redmine::Configuration['imagemagick_convert_command'])
+        end
         MiniMagick::Tool::Convert.new do |gc|
           gc.size('%dx%d' % [subject_width + g_width + 1, height])
           gc.xc('white')