Fix sign-up restrictions based on IP addresses not being enforced (ma…

…stodon#15607) Fixes mastodon#15606 Co-authored-by: Claire <[email protected]>
hachyderm · Jan 21, 2021 · e955ca5 · e955ca5
1 parent d8d75cd
commit e955ca5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -152,7 +152,7 @@ def enable!
 
   def confirm
     new_user      = !confirmed?
-    self.approved = true if open_registrations?
+    self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
 
     super