monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make theme-selection fall back to default ones if configured is not found

This commit is contained in:
Claire 2022-02-05 10:27:24 +01:00
parent 73b730e649
commit 5f48ec9e42
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/application_controller.rb
View File

@ -137,13 +137,12 @@ class ApplicationController < ActionController::Base
end end
def current_flavour def current_flavour
return Setting.flavour unless Themes.instance.flavours.include? current_user&.setting_flavour [current_user&.setting_flavour, Setting.flavour, 'glitch', 'vanilla'].find { |flavour| Themes.instance.flavours.include?(flavour) }
current_user.setting_flavour
end end
def current_skin def current_skin
return Setting.skin unless Themes.instance.skins_for(current_flavour).include? current_user&.setting_skin skins = Themes.instance.skins_for(current_flavour)
current_user.setting_skin [current_user&.setting_skin, Setting.skin, 'default'].find { |skin| skins.include?(skin) }
end end
def respond_with_error(code) def respond_with_error(code)