aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2005-05-21 20:21:41 +0000
committerAlexey Shchepin <alexey@process-one.net>2005-05-21 20:21:41 +0000
commit9f27556a01530c3eba76013826d0ac6dd1e34099 (patch)
tree13736d784db772b91708a7859ef5523292439130
parent* src/msgs/ru.msg: Updated (thanks to Sergei Golovan) (diff)
* src/mod_pubsub/mod_pubsub.erl: Fixed XML element name for
pubsub#event namespace (thanks to Magnus Henoch) SVN Revision: 352
-rw-r--r--ChangeLog3
-rw-r--r--src/mod_pubsub/mod_pubsub.erl10
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f0669dff8..7810ea0dd 100644
--- 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 6d422791d..1823be44d 100644
--- 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)}],