mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-18 22:15:20 +02:00
Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.1.x
This commit is contained in:
commit
2787df035c
|
@ -602,10 +602,10 @@ get_user_displayed_groups(US) ->
|
||||||
end, get_user_groups(US))),
|
end, get_user_groups(US))),
|
||||||
[Group || Group <- DisplayedGroups1, is_group_enabled(Host, Group)].
|
[Group || Group <- DisplayedGroups1, is_group_enabled(Host, Group)].
|
||||||
|
|
||||||
is_user_in_group({_U, S} = US, Group, Host) ->
|
is_user_in_group(US, Group, Host) ->
|
||||||
case catch mnesia:dirty_match_object(
|
case catch mnesia:dirty_match_object(
|
||||||
#sr_user{us=US, group_host={Group, Host}}) of
|
#sr_user{us=US, group_host={Group, Host}}) of
|
||||||
[] -> lists:member(US, get_group_users(S, Group));
|
[] -> lists:member(US, get_group_users(Host, Group));
|
||||||
_ -> true
|
_ -> true
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user