github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 16:05:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Color scheme stylesheet not loaded when no default theme is set.

Browse Source 
Follow-up to 8e3691d5370bb95d99fe750f46287763721fcc9c
This commit is contained in:
Alan Guo Xiang Tan
2021-06-21 12:44:41 +08:00
parent 7b31d8a11b
commit be655762d8
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/stylesheet/manager.rb
View File

@ -269,23 +269,19 @@ class Stylesheet::Manager
theme = get_theme(theme_id)
if theme
builder = Builder.new(
target: target,
theme: get_theme(theme_id),
color_scheme: color_scheme,
manager: self
)
builder = Builder.new(
target: target,
theme: get_theme(theme_id),
color_scheme: color_scheme,
manager: self
)
builder.compile unless File.exists?(builder.stylesheet_fullpath)
builder.compile unless File.exists?(builder.stylesheet_fullpath)
href = builder.stylesheet_path(current_hostname)
stylesheet[:new_href] = href
cache.defer_set(cache_key, stylesheet.freeze)
stylesheet
else
{}
end
href = builder.stylesheet_path(current_hostname)
stylesheet[:new_href] = href
cache.defer_set(cache_key, stylesheet.freeze)
stylesheet
end
def color_scheme_stylesheet_link_tag(color_scheme_id = nil, media = 'all')