From 1247a98cf2f5d356c26106bd4f3f54d632c43cea Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Fri, 21 Mar 2008 16:05:32 +0000 Subject: Pubsub subscription is now wrapped in pubsub tags (EJAB-580) SVN Revision: 1244 --- src/mod_pubsub/mod_pubsub.erl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 44d5b26c8..f70129de9 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -1355,13 +1355,12 @@ subscribe_node(Host, Node, From, JID) -> [{"node", node_to_string(Node)}, {"jid", jlib:jid_to_string(Subscriber)}, {"subscription", subscription_to_string(Subscription)}], - case Subscription of - subscribed -> - [{xmlelement, "subscription", - Fields ++ [{"subid", SubId}], []}]; - _ -> - [{xmlelement, "subscription", Fields, []}] - end + [{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], + [{xmlelement, "subscription", + case Subscription of + subscribed -> [{"subid", SubId}|Fields]; + _ -> Fields + end, []}]}] end, case transaction(Host, Node, Action, sync_dirty) of {error, Error} -> -- cgit v1.2.3