summaryrefslogtreecommitdiffstats
path: root/lib/redmine/info.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/redmine/info.rb')
-rw-r--r--lib/redmine/info.rb15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb
index 60d682c77..1933a1cda 100644
--- a/lib/redmine/info.rb
+++ b/lib/redmine/info.rb
@@ -20,16 +20,13 @@ module Redmine
["Mailer delivery", ActionMailer::Base.delivery_method]
].map {|info| " %-30s %s" % info}.join("\n") + "\n"
- theme = Setting.ui_theme.blank? ? 'Default' : Setting.ui_theme.capitalize
- unless Setting.ui_theme.blank?
- theme_js = (if Redmine::Themes.theme(Setting.ui_theme).javascripts.include?('theme')
- ' (includes JavaScript)'
- else
- ''
- end
- )
+ theme_string = ''
+ theme_string += (Setting.ui_theme.blank? ? 'Default' : Setting.ui_theme.capitalize)
+ unless Setting.ui_theme.blank? ||
+ Redmine::Themes.theme(Setting.ui_theme).nil? ||
+ !Redmine::Themes.theme(Setting.ui_theme).javascripts.include?('theme')
+ theme_string += ' (includes JavaScript)'
end
- theme_string = (theme + theme_js.to_s).to_s
s << "Redmine settings:\n"
s << [