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 dcddcca2ab0cde85481f2f48cd28336ebe37fee5..1223c0fe0beb0e799bf415b3cd1af2a3de252877 100644 (file)
--- 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')