Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

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

SVN Revision: 1181
This commit is contained in:
Christophe Romain 2008-02-11 15:21:24 +00:00
parent a90606b104
commit 7d73151737
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2008-02-08 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: Include the error condition in the * src/mod_muc/mod_muc_room.erl: Include the error condition in the

8
src/mod_pubsub/mod_pubsub.erl
View File

@ -1652,7 +1652,7 @@ get_items(Host, Node, _JID, SMaxItems) ->
end, end,
{xmlelement, "item", ItemAttrs, Payload} {xmlelement, "item", ItemAttrs, Payload}
end, lists:sublist(Items, MaxItems)), 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)}], [{xmlelement, "items", [{"node", node_to_string(Node)}],
ItemsEls}]}]} ItemsEls}]}]}
end end
@ -1693,7 +1693,7 @@ send_items(Host, Node, LJID, Number) ->
{xmlelement, "item", ItemAttrs, Payload} {xmlelement, "item", ItemAttrs, Payload}
end, ToSend), end, ToSend),
Stanza = {xmlelement, "message", [], Stanza = {xmlelement, "message", [],
[{xmlelement, "x", [{"xmlns", ?NS_PUBSUB_EVENT}], [{xmlelement, "event", [{"xmlns", ?NS_PUBSUB_EVENT}],
[{xmlelement, "items", [{"node", node_to_string(Node)}], [{xmlelement, "items", [{"node", node_to_string(Node)}],
ItemsEls}]}]}, ItemsEls}]}]},
ejabberd_router ! {route, service_jid(Host), jlib:make_jid(LJID), Stanza}. ejabberd_router ! {route, service_jid(Host), jlib:make_jid(LJID), Stanza}.
@ -2101,7 +2101,7 @@ broadcast_retract_item(Host, Node, ItemId, ForceNotify) ->
_ -> [{"id", ItemId}] _ -> [{"id", ItemId}]
end, end,
Stanza = {xmlelement, "message", [], Stanza = {xmlelement, "message", [],
[{xmlelement, "x", [{xmlelement, "event",
[{"xmlns", ?NS_PUBSUB_EVENT}], [{"xmlns", ?NS_PUBSUB_EVENT}],
[{xmlelement, "items", [{"node", node_to_string(Node)}], [{xmlelement, "items", [{"node", node_to_string(Node)}],
[{xmlelement, "retract", ItemAttrs, []}]}]}]}, [{xmlelement, "retract", ItemAttrs, []}]}]}]},
@ -2212,7 +2212,7 @@ broadcast_config_notification(Host, Node, Lang) ->
[] []
end, end,
Stanza = {xmlelement, "message", [], Stanza = {xmlelement, "message", [],
[{xmlelement, "x", [{"xmlns", ?NS_PUBSUB_EVENT}], [{xmlelement, "event", [{"xmlns", ?NS_PUBSUB_EVENT}],
[{xmlelement, "items", [{"node", node_to_string(Node)}], [{xmlelement, "items", [{"node", node_to_string(Node)}],
[{xmlelement, "item", [{"id", "configuration"}], [{xmlelement, "item", [{"id", "configuration"}],
Content}]}]}]}, Content}]}]}]},