use if event instead of x when xmlns is pubsub#event (EJAB-518)

SVN Revision: 1181

diff --git a/ChangeLog b/ChangeLog
index dffc4a249d672204f431d7428311762fd09ec0f8..cb88f36f5b6eeb554a20f5715eab041daf7998ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-11  Christophe Romain <christophe.romain@process-one.net>
+
+       * src/mod_pubsub/mod_pubsub.erl: Bugfix: event used in place of x when
+       xmlns is pubsub#event (EJAB-518)
+
 2008-02-08  Badlop  <badlop@process-one.net>
 
        * src/mod_muc/mod_muc_room.erl: Include the error condition in the

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 12ea98cba3a6f7cb607ca54f2cafe78884e1f1f7..a27656c7ae6ea2459100d5974f3463f88fa506b5 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1652,7 +1652,7 @@ get_items(Host, Node, _JID, SMaxItems) ->
                                                     end,
                                         {xmlelement, "item", ItemAttrs, Payload}
                                 end, lists:sublist(Items, MaxItems)),
-                   {result, [{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB_EVENT}],
+                   {result, [{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}],
                               [{xmlelement, "items", [{"node", node_to_string(Node)}],
                                 ItemsEls}]}]}
            end
@@ -1693,7 +1693,7 @@ send_items(Host, Node, LJID, Number) ->
                         {xmlelement, "item", ItemAttrs, Payload}
                 end, ToSend),
     Stanza = {xmlelement, "message", [],
-             [{xmlelement, "x", [{"xmlns", ?NS_PUBSUB_EVENT}],
+             [{xmlelement, "event", [{"xmlns", ?NS_PUBSUB_EVENT}],
                [{xmlelement, "items", [{"node", node_to_string(Node)}],
                  ItemsEls}]}]},
     ejabberd_router ! {route, service_jid(Host), jlib:make_jid(LJID), Stanza}.
@@ -2101,7 +2101,7 @@ broadcast_retract_item(Host, Node, ItemId, ForceNotify) ->
                            _ -> [{"id", ItemId}]
                        end,
                        Stanza = {xmlelement, "message", [],
-                                  [{xmlelement, "x",
+                                  [{xmlelement, "event",
                                     [{"xmlns", ?NS_PUBSUB_EVENT}],
                                       [{xmlelement, "items", [{"node", node_to_string(Node)}],
                                         [{xmlelement, "retract", ItemAttrs, []}]}]}]},
@@ -2212,7 +2212,7 @@ broadcast_config_notification(Host, Node, Lang) ->
                                        []
                                end,
                                Stanza = {xmlelement, "message", [],
-                                          [{xmlelement, "x", [{"xmlns", ?NS_PUBSUB_EVENT}],
+                                          [{xmlelement, "event", [{"xmlns", ?NS_PUBSUB_EVENT}],
                                             [{xmlelement, "items", [{"node", node_to_string(Node)}],
                                               [{xmlelement, "item", [{"id", "configuration"}],
                                                 Content}]}]}]},