diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-09-15 20:39:40 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-09-15 20:39:40 +0000 |
commit | fc64fc3e9c1004171c495e055dd482e364284d7b (patch) | |
tree | 107986a2cdde65b847225220b8e32c5780362202 /app/controllers/admin_controller.rb | |
parent | a2206ab5a043bf96c9e1a930dfbbbfc89249fa97 (diff) | |
download | redmine-fc64fc3e9c1004171c495e055dd482e364284d7b.tar.gz redmine-fc64fc3e9c1004171c495e055dd482e364284d7b.zip |
Added RMagick availability on admin/info.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@738 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/admin_controller.rb')
-rw-r--r-- | app/controllers/admin_controller.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 2451f5ef6..ccc107507 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -70,8 +70,10 @@ class AdminController < ApplicationController def info @db_adapter_name = ActiveRecord::Base.connection.adapter_name - @flags = Hash.new - @flags[:default_admin_changed] = User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil? - @flags[:file_repository_writable] = File.writable?(Attachment.storage_path) + @flags = { + :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?, + :file_repository_writable => File.writable?(Attachment.storage_path), + :rmagick_available => Object.const_defined?(:Magick) + } end end |