aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2008-02-11 15:21:24 +0000
committerChristophe Romain <christophe.romain@process-one.net>2008-02-11 15:21:24 +0000
commit7d73151737c28a62759d008e5a97d1980558270f (patch)
treebde288b81a08126c07087f66d63403be39bff6f3 /src
parent* src/mod_muc/mod_muc_room.erl: Include the error condition in the (diff)
use if event instead of x when xmlns is pubsub#event (EJAB-518)
SVN Revision: 1181
Diffstat (limited to 'src')
-rw-r--r--src/mod_pubsub/mod_pubsub.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 12ea98cba..a27656c7a 100644
--- 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}]}]}]},