Project

General

Profile

Defect #31125 ยป stop-output-imagemagick-banner-to-stdout.patch

Go MAEDA, 2019-03-31 09:27

View differences:

lib/redmine/thumbnail.rb
51 51

  
52 52
    def self.convert_available?
53 53
      return @convert_available if defined?(@convert_available)
54
      @convert_available = system("#{shell_quote CONVERT_BIN} -version") rescue false
54
      begin
55
        `#{shell_quote CONVERT_BIN} -version`
56
        @convert_available = $?.success?
57
      rescue
58
        @convert_available = false
59
      end
55 60
      logger.warn("Imagemagick's convert binary (#{CONVERT_BIN}) not available") unless @convert_available
56 61
      @convert_available
57 62
    end
    (1-1/1)