meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-11 13:15:20 +00:00
Code Issues Releases Wiki Activity

Handle nil return of Redmine::Themes.theme(Setting.ui_theme) in Redmine::Info.environment (#36932).

Browse Source 
Patch by Mischa The Evil.


git-svn-id: https://svn.redmine.org/redmine/trunk@21541 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-04-27 20:56:07 +00:00
parent 9243a5ffaa
commit 4fdcbc212b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/redmine/info.rb
View File

@ -20,16 +20,13 @@ module Redmine
["Mailer delivery", ActionMailer::Base.delivery_method] ["Mailer delivery", ActionMailer::Base.delivery_method]
].map {|info| " %-30s %s" % info}.join("\n") + "\n" ].map {|info| " %-30s %s" % info}.join("\n") + "\n"
theme = Setting.ui_theme.blank? ? 'Default' : Setting.ui_theme.capitalize theme_string = ''
unless Setting.ui_theme.blank? theme_string += (Setting.ui_theme.blank? ? 'Default' : Setting.ui_theme.capitalize)
theme_js = (if Redmine::Themes.theme(Setting.ui_theme).javascripts.include?('theme') unless Setting.ui_theme.blank? ||
' (includes JavaScript)' Redmine::Themes.theme(Setting.ui_theme).nil? ||
else !Redmine::Themes.theme(Setting.ui_theme).javascripts.include?('theme')
'' theme_string += ' (includes JavaScript)'
end
)
end end
theme_string = (theme + theme_js.to_s).to_s
s << "Redmine settings:\n" s << "Redmine settings:\n"
s << [ s << [