From a81749fe66eb416c35f58ef91524be95b7cb9411 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 5 May 2019 00:44:32 +0000 Subject: [PATCH] Don't output ImageMagick version information to stdout (#31125). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@18126 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/thumbnail.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb index a46a09ee1..31ac62272 100644 --- a/lib/redmine/thumbnail.rb +++ b/lib/redmine/thumbnail.rb @@ -51,7 +51,12 @@ module Redmine def self.convert_available? return @convert_available if defined?(@convert_available) - @convert_available = system("#{shell_quote CONVERT_BIN} -version") rescue false + begin + `#{shell_quote CONVERT_BIN} -version` + @convert_available = $?.success? + rescue + @convert_available = false + end logger.warn("Imagemagick's convert binary (#{CONVERT_BIN}) not available") unless @convert_available @convert_available end -- 2.39.5