diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-04-27 20:56:07 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-04-27 20:56:07 +0000 |
| commit | 4fdcbc212bedf1bcf1d82f41c9c19ad006b9ef5e (patch) | |
| tree | b82baa6291c4daca7d2b4e77df9d63afae2a3211 /lib | |
| parent | 9243a5ffaa67c1fd77a0c77e656416646989f9e8 (diff) | |
| download | redmine-4fdcbc212bedf1bcf1d82f41c9c19ad006b9ef5e.tar.gz redmine-4fdcbc212bedf1bcf1d82f41c9c19ad006b9ef5e.zip | |
Handle nil return of Redmine::Themes.theme(Setting.ui_theme) in Redmine::Info.environment (#36932).
Patch by Mischa The Evil.
git-svn-id: https://svn.redmine.org/redmine/trunk@21541 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/info.rb | 15 |
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 << [ |