treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix PermalinkRedirector not applying to users with moved accounts (#22497) 

Fixes #22262
lolsob-rspec
Claire 2023-01-05 13:40:27 +01:00 committed by GitHub
parent 4515ec2696
commit 81ae025687
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/web_app_controller_concern.rb
View File

@ -4,7 +4,7 @@ module WebAppControllerConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do
before_action :redirect_unauthenticated_to_permalinks! prepend_before_action :redirect_unauthenticated_to_permalinks!
before_action :set_app_body_class before_action :set_app_body_class
before_action :set_referrer_policy_header before_action :set_referrer_policy_header
end end
@ -18,7 +18,7 @@ module WebAppControllerConcern
end end
def redirect_unauthenticated_to_permalinks! def redirect_unauthenticated_to_permalinks!
return if user_signed_in? return if user_signed_in? && current_account.moved_to_account_id.nil?
redirect_path = PermalinkRedirector.new(request.path).redirect_path redirect_path = PermalinkRedirector.new(request.path).redirect_path