Pubsub subscription is now wrapped in pubsub tags (EJAB-580)

SVN Revision: 1245

diff --git a/ChangeLog b/ChangeLog
index 175dd9b6366cfdc0e213b2bd3a3e56f7ad154c54..59c134e589fe27e0cb41af5ba957a944558b40b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,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 a27656c7ae6ea2459100d5974f3463f88fa506b5..b9ba6b86647a9db72deabda59760e8f1aa30b405 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1351,13 +1351,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} ->