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

DEV: Extract theme resolution to a helper (#27426)

Browse Source 
This ensures that the theme id is resolved as early as possible in the
request cycle. This is necessary for the custom homepage to skip
preloading the wrong data.
This commit is contained in:
Penar Musaraj
2024-06-20 11:33:46 -04:00
committed by GitHub
parent d29160131d
commit 33de5abb6e
7 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/homepage_constraint.rb
View File

@ -9,7 +9,11 @@ class HomePageConstraint
return @filter == "finish_installation" if SiteSetting.has_login_hint?
current_user = CurrentUser.lookup_from_env(request.env)
homepage = current_user&.user_option&.homepage || HomepageHelper.resolve(request, current_user)
# ensures we resolve the theme id as early as possible
theme_id = ThemeResolver.resolve_theme_id(request, Guardian.new(current_user), current_user)
homepage = current_user&.user_option&.homepage || HomepageHelper.resolve(theme_id, current_user)
homepage == @filter
rescue Discourse::InvalidAccess, Discourse::ReadOnly
false