summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-11-15 20:11:00 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-11-15 20:11:00 +0000
commitf69b4da75f58c1efb578a914adfbb978e4460839 (patch)
tree5e5524178fb9c243cfc35e18563519e46b24ff75 /app
parent71c61f4996aed44f3b89d66e5a2a0e86b32f3888 (diff)
downloadredmine-f69b4da75f58c1efb578a914adfbb978e4460839.tar.gz
redmine-f69b4da75f58c1efb578a914adfbb978e4460839.zip
Add an indication to admin/info whether or not ImageMagick convert is available (#15311).
Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@12278 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 2cabbd3e1..ad6581120 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -77,7 +77,8 @@ class AdminController < ApplicationController
[:text_default_administrator_account_changed, User.default_admin_account_changed?],
[:text_file_repository_writable, File.writable?(Attachment.storage_path)],
[:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)],
- [:text_rmagick_available, Object.const_defined?(:Magick)]
+ [:text_rmagick_available, Object.const_defined?(:Magick)],
+ [:text_convert_available, Redmine::Thumbnail.convert_available?]
]
end
end