1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-30 15:58:28 +09:00

Fix failure when “Require a reason to join” is set with open registrations (#22127)

This commit is contained in:
Claire 2022-12-07 16:39:58 +01:00 committed by GitHub
parent c52263f6f8
commit ed07f10ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -516,7 +516,7 @@ class User < ApplicationRecord
end end
def invite_text_required? def invite_text_required?
Setting.require_invite_text && !invited? && !external? && !bypass_invite_request_check? Setting.require_invite_text && !open_registrations? && !invited? && !external? && !bypass_invite_request_check?
end end
def trigger_webhooks def trigger_webhooks