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

FIX: Regression in custom homepage modifier used in theme components (#27569)

Browse Source
This commit is contained in:
Penar Musaraj
2024-06-21 11:24:11 -04:00
committed by GitHub
parent 099bffe37a
commit f4108702c8
5 changed files with 91 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/homepage_constraint.rb
View File

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