If registrations have been re-opened when user confirms account, appr…

…ove (mastodon#10349)
ProjectMyosotis · Oct 2, 2019 · 7984c7b · 7984c7b
1 parent aed64c6
commit 7984c7b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -124,7 +124,8 @@ def enable!
   end
 
   def confirm
-    new_user = !confirmed?
+    new_user      = !confirmed?
+    self.approved = true if open_registrations?
 
     super
 
@@ -136,7 +137,8 @@ def confirm
   end
 
   def confirm!
-    new_user = !confirmed?
+    new_user      = !confirmed?
+    self.approved = true if open_registrations?
 
     skip_confirmation!
     save!
@@ -264,7 +266,11 @@ def send_devise_notification(notification, *args)
   private
 
   def set_approved
-    self.approved = Setting.registrations_mode == 'open' || invited?
+    self.approved = open_registrations? || invited?
+  end
+
+  def open_registrations?
+    Setting.registrations_mode == 'open'
   end
 
   def sanitize_languages