From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Sep 2019 04:13:50 +0000 (+0200)
Subject: Fix wrong variable regression from #11753 (#11763)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=58755439ac758f173cf6c8afb49d62b450782d14;p=mastodon.git

Fix wrong variable regression from #11753 (#11763)
---

diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 3e419eb96..898525269 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -26,7 +26,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
 
   def after_resending_confirmation_instructions_path_for(_resource_name)
     if user_signed_in?
-      if user.confirmed? && user.approved?
+      if current_user.confirmed? && current_user.approved?
         edit_user_registration_path
       else
         auth_setup_path