github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: theme selection is now global per-user

Browse Source
This commit is contained in:
Sam
2017-05-12 12:41:26 -04:00
parent b301b69d00
commit 2d96a0785d
11 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/application_controller.rb
View File

@ -18,6 +18,8 @@ class ApplicationController < ActionController::Base
include JsonError
include GlobalPath
attr_reader :theme_key
serialization_scope :guardian
protect_from_forgery
@ -265,12 +267,15 @@ class ApplicationController < ActionController::Base
resolve_safe_mode
return if request.env[NO_CUSTOM]
theme_key = flash[:preview_theme_key] || cookies[:theme_key] || session[:theme_key]
theme_key = flash[:preview_theme_key] || current_user&.user_option&.theme_key
# TODO 2018: delete this, old cookie cleanup code
if cookies[:theme_key]
cookies.delete(:theme_key)
end
if theme_key && !guardian.allow_theme?(theme_key)
theme_key = nil
cookies[:theme_key] = nil
session[:theme_key] = nil
end
theme_key ||= SiteSetting.default_theme_key