about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-05 13:40:27 +0100
committerGitHub <noreply@github.com>2023-01-05 13:40:27 +0100
commit42f9693d0032b5e165568f89d4bf611016a88955 (patch)
tree3cfadd35587d8e22dbcbba9c0bc3bd857fd6eb5a /app
parent83888739fdc4de7f6a6d6d3e3bd53473acca4569 (diff)
Fix PermalinkRedirector not applying to users with moved accounts (#22497)
Fixes #22262
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/web_app_controller_concern.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index c671ce785..cbd522246 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -4,7 +4,7 @@ module WebAppControllerConcern
   extend ActiveSupport::Concern
 
   included do
-    before_action :redirect_unauthenticated_to_permalinks!
+    prepend_before_action :redirect_unauthenticated_to_permalinks!
     before_action :set_app_body_class
     before_action :set_referrer_policy_header
   end
@@ -18,7 +18,7 @@ module WebAppControllerConcern
   end
 
   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