Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

apply badlop's patch from http://www.ejabberd.im/node/3629

Browse Source 
SVN Revision: 2530
This commit is contained in:
Christophe Romain 2009-08-25 15:09:12 +00:00
parent 3909f95ac1
commit f303a40973
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jlib.hrl
View File

@ -82,6 +82,7 @@
-define(NS_COMPRESS, "http://jabber.org/protocol/compress"). -define(NS_COMPRESS, "http://jabber.org/protocol/compress").
-define(NS_CAPS, "http://jabber.org/protocol/caps"). -define(NS_CAPS, "http://jabber.org/protocol/caps").
-define(NS_SHIM, "http://jabber.org/protocol/shim").
%% CAPTCHA related NSes. %% CAPTCHA related NSes.
-define(NS_OOB, "jabber:x:oob"). -define(NS_OOB, "jabber:x:oob").

5
src/mod_pubsub/mod_pubsub.erl
View File

@ -3632,8 +3632,9 @@ itemsEls(Items) ->
{xmlelement, "item", itemAttr(ItemId), Payload} {xmlelement, "item", itemAttr(ItemId), Payload}
end, Items). end, Items).
add_headers({xmlelement, Name, Attrs, Els}, Headers) -> add_headers({xmlelement, Name, Attrs, Els}, HeaderEls) ->
{xmlelement, Name, Attrs, Els ++ Headers}. HeaderEl = {xmlelement, "headers", [{"xmlns", ?NS_SHIM}], HeaderEls},
{xmlelement, Name, Attrs, [HeaderEl | Els]}.
collection_shim(Node, Nodes) -> collection_shim(Node, Nodes) ->
[{xmlelement, "header", [{"name", "Collection"}], [{xmlelement, "header", [{"name", "Collection"}],

5
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -3689,8 +3689,9 @@ itemsEls(Items) ->
{xmlelement, "item", itemAttr(ItemId), Payload} {xmlelement, "item", itemAttr(ItemId), Payload}
end, Items). end, Items).
add_headers({xmlelement, Name, Attrs, Els}, Headers) -> add_headers({xmlelement, Name, Attrs, Els}, HeaderEls) ->
{xmlelement, Name, Attrs, Els ++ Headers}. HeaderEl = {xmlelement, "headers", [{"xmlns", ?NS_SHIM}], HeaderEls},
{xmlelement, Name, Attrs, [HeaderEl | Els]}.
collection_shim(Node, Nodes) -> collection_shim(Node, Nodes) ->
[{xmlelement, "header", [{"name", "Collection"}], [{xmlelement, "header", [{"name", "Collection"}],