Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

fix configuration result (EJAB-995)

Browse Source 
SVN Revision: 2408
This commit is contained in:
Christophe Romain 2009-07-30 13:13:22 +00:00
parent cd68e0021e
commit b08c061683
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod_pubsub/mod_pubsub.erl
View File

@ -2918,14 +2918,13 @@ broadcast_config_notification(Host, Node, NodeId, Type, NodeOptions, Lang) ->
SubsByDepth when is_list(SubsByDepth) ->
Content = case get_option(NodeOptions, deliver_payloads) of
true ->
[{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
[{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "result"}],
get_configure_xfields(Type, NodeOptions, Lang, [])}];
false ->
[]
end,
Stanza = event_stanza(
[{xmlelement, "items", nodeAttr(Node),
[{xmlelement, "item", itemAttr("configuration"), Content}]}]),
[{xmlelement, "configuration", nodeAttr(Node), Content}]),
broadcast_stanza(Host, Node, NodeId, Type,
NodeOptions, SubsByDepth, nodes, Stanza),
{result, true};

12
src/mod_pubsub/node_hometree.erl
View File

@ -679,14 +679,14 @@ get_node_subscriptions(NodeId) ->
case Subscriptions of
[_|_] ->
lists:foldl(fun({S, SubID}, Acc) ->
[{J, S, SubID} | Acc];
(S, Acc) ->
[{J, S} | Acc]
[{J, S, SubID} | Acc];
(S, Acc) ->
[{J, S} | Acc]
end, [], Subscriptions);
[] ->
[];
[] ->
[];
_ ->
[{J, none}]
[{J, none}]
end
end,
{result, lists:flatmap(Tr, States)}.