25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00

Fix bug introduced in commit b88fa6f617

This commit is contained in:
Badlop 2015-06-04 15:47:02 +02:00
parent c04053cfae
commit 357ff6c8f7

View File

@ -985,11 +985,11 @@ push_user_to_displayed(LUser, LServer, Group, Host, Subscription, DisplayedToGro
GroupName = proplists:get_value(name, GroupOpts, Group), GroupName = proplists:get_value(name, GroupOpts, Group),
[push_user_to_group(LUser, LServer, GroupD, Host, [push_user_to_group(LUser, LServer, GroupD, Host,
GroupName, Subscription) GroupName, Subscription)
|| {GroupD, _Opts} <- DisplayedToGroupsOpts]. || GroupD <- DisplayedToGroupsOpts].
broadcast_user_to_displayed(LUser, LServer, Host, Subscription, DisplayedToGroupsOpts) -> broadcast_user_to_displayed(LUser, LServer, Host, Subscription, DisplayedToGroupsOpts) ->
[broadcast_user_to_group(LUser, LServer, GroupD, Host, Subscription) [broadcast_user_to_group(LUser, LServer, GroupD, Host, Subscription)
|| {GroupD, _Opts} <- DisplayedToGroupsOpts]. || GroupD <- DisplayedToGroupsOpts].
push_user_to_group(LUser, LServer, Group, Host, push_user_to_group(LUser, LServer, Group, Host,
GroupName, Subscription) -> GroupName, Subscription) ->
@ -1012,12 +1012,13 @@ broadcast_user_to_group(LUser, LServer, Group, Host, Subscription) ->
%% Get list of groups to which this group is displayed %% Get list of groups to which this group is displayed
displayed_to_groups(GroupName, LServer) -> displayed_to_groups(GroupName, LServer) ->
GroupsOpts = groups_with_opts(LServer), GroupsOpts = groups_with_opts(LServer),
lists:filter(fun ({_Group, Opts}) -> Gs = lists:filter(fun ({_Group, Opts}) ->
lists:member(GroupName, lists:member(GroupName,
proplists:get_value(displayed_groups, proplists:get_value(displayed_groups,
Opts, [])) Opts, []))
end, end,
GroupsOpts). GroupsOpts),
[Name || {Name, _} <- Gs].
push_item(User, Server, Item) -> push_item(User, Server, Item) ->
Stanza = jlib:iq_to_xml(#iq{type = set, Stanza = jlib:iq_to_xml(#iq{type = set,