]> granicus.if.org Git - ejabberd/commitdiff
Revert "Affiliations other than admin and owner cannot invite to members_only rooms"
authorBadlop <badlop@process-one.net>
Tue, 13 Aug 2019 12:55:37 +0000 (14:55 +0200)
committerBadlop <badlop@process-one.net>
Tue, 13 Aug 2019 12:55:37 +0000 (14:55 +0200)
This reverts commit b010a1a0a03fb304ad018b4d42d69df93ca4c5a1.
More details in #2987

src/mod_muc_room.erl

index cf4edeca2568d2d19b7377dcb1d0ac5bec69728f..0dfd078a55f2b93425281ddc864ac602e77f254d 100644 (file)
@@ -4410,8 +4410,7 @@ send_voice_request(From, Lang, StateData) ->
                              ok | {error, stanza_error()}.
 check_invitation(From, Invitations, Lang, StateData) ->
     FAffiliation = get_affiliation(From, StateData),
-    CanInvite = ((StateData#state.config)#config.allow_user_invites
-               and not (StateData#state.config)#config.members_only) orelse
+    CanInvite = (StateData#state.config)#config.allow_user_invites orelse
                FAffiliation == admin orelse FAffiliation == owner,
     case CanInvite of
        true ->