fix configuration result (EJAB-995)

SVN Revision: 2408

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index c549c584cd574e33e1a14a4b8707701afbe51350..a216c76f2cc26cc916e7cb97b09305b2247380d0 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -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};

diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl
index 81c242bc20e4fb23f5c4d598db2b2c081fc1db62..680fec39d4ff41270cd9ef32d0f277e4597a2110 100644 (file)
--- a/src/mod_pubsub/node_hometree.erl
+++ b/src/mod_pubsub/node_hometree.erl
@@ -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)}.