diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 13 |
2 files changed, 9 insertions, 7 deletions
@@ -6,6 +6,9 @@ * src/ejabberdctl.template: Likewise * tools/ejabberdctl: Likewise + * src/mod_pubsub/mod_pubsub.erl: Pubsub subscription is now wrapped in + pubsub tags (EJAB-580) + 2008-03-21 Badlop <badlop@process-one.net> * src/cyrsasl_digest.erl: Rewrite io:format calls to loglevel 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} -> |