* src/mod_pubsub/mod_pubsub.erl: Fixed XML element name for

pubsub#event namespace (thanks to Magnus Henoch)

SVN Revision: 352

diff --git a/ChangeLog b/ChangeLog
index f0669dff8401140d256f79fb39f861153801ee4b..7810ea0ddda2ac7a51caeb98c11e12b21135f528 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-21  Alexey Shchepin  <alexey@sevcom.net>
 
+       * src/mod_pubsub/mod_pubsub.erl: Fixed XML element name for
+       pubsub#event namespace (thanks to Magnus Henoch)
+
        * src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
        * src/msgs/uk.msg: Likewise
 

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 6d422791d437041bfe26f270459625df4b71e99e..1823be44d21b4508e7e896df6b9e1c7f2a9d6605 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -716,7 +716,7 @@ get_items(Host, JID, Node, SMaxItems) ->
                                  {xmlelement, "item", ItemAttrs, Payload}
                          end, Items),
                    {result, [{xmlelement, "pubsub",
-                              [{"xmlns", ?NS_PUBSUB_EVENT}],
+                              [{"xmlns", ?NS_PUBSUB}],
                               [{xmlelement, "items",
                                 [{"node", node_to_string(Node)}],
                                 ItemsEls}]}]};
@@ -827,7 +827,7 @@ get_entities(Host, OJID, Node) ->
                                    []} | Acc]
                          end, [], Entities),
                    {result, [{xmlelement, "pubsub",
-                              [{"xmlns", ?NS_PUBSUB_EVENT}],
+                              [{"xmlns", ?NS_PUBSUB}],
                               [{xmlelement, "entities",
                                 [{"node", node_to_string(Node)}],
                                 EntitiesEls}]}]};
@@ -1091,7 +1091,7 @@ broadcast_publish_item(Host, Node, ItemID, Payload) ->
                                           end,
                               Stanza =
                                   {xmlelement, "message", [],
-                                   [{xmlelement, "x",
+                                   [{xmlelement, "event",
                                      [{"xmlns", ?NS_PUBSUB_EVENT}],
                                      [{xmlelement, "items",
                                        [{"node", node_to_string(Node)}],
@@ -1123,7 +1123,7 @@ broadcast_retract_item(Host, Node, ItemID) ->
                                           end,
                               Stanza =
                                   {xmlelement, "message", [],
-                                   [{xmlelement, "x",
+                                   [{xmlelement, "event",
                                      [{"xmlns", ?NS_PUBSUB_EVENT}],
                                      [{xmlelement, "items",
                                        [{"node", node_to_string(Node)}],
@@ -1150,7 +1150,7 @@ broadcast_removed_node(Host, Removed) ->
                             (Subscription /= pending) ->
                                 Stanza =
                                     {xmlelement, "message", [],
-                                     [{xmlelement, "x",
+                                     [{xmlelement, "event",
                                        [{"xmlns", ?NS_PUBSUB_EVENT}],
                                        [{xmlelement, "delete",
                                          [{"node", node_to_string(Node)}],