zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

If registrations have been re-opened when user confirms account, approve (#10349)

This commit is contained in:
Eugen Rochko 2019-03-23 02:23:48 +01:00 committed by GitHub
parent 013a9e0bed
commit 00d988955f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@ -125,6 +125,7 @@ class User < ApplicationRecord
def confirm def confirm
new_user = !confirmed? new_user = !confirmed?
self.approved = true if open_registrations?
super super
@ -137,6 +138,7 @@ class User < ApplicationRecord
def confirm! def confirm!
new_user = !confirmed? new_user = !confirmed?
self.approved = true if open_registrations?
skip_confirmation! skip_confirmation!
save! save!
@ -264,7 +266,11 @@ class User < ApplicationRecord
private private
def set_approved def set_approved
self.approved = Setting.registrations_mode == 'open' || invited? self.approved = open_registrations? || invited?
end
def open_registrations?
Setting.registrations_mode == 'open'
end end
def sanitize_languages def sanitize_languages