diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2015-04-21 16:11:00 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2015-04-21 16:11:00 +0200 |
| commit | 61f80396dac63e47f440ad39212c9e4adeb69e21 (patch) | |
| tree | e0cea4d356d7f1accd2b9325f697ca4800f50f2f | |
| parent | Owner can subscribe to its node (#454) (diff) | |
remove deferred Collection shim header
| -rw-r--r-- | src/mod_pubsub.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index d5398fadf..e266e89be 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -3427,9 +3427,9 @@ broadcast_stanza(Host, _Node, _Nidx, _Type, NodeOptions, SubsByDepth, NotifyType Stanza; %% If there's only one SubID, don't add it {true, [_]} -> - add_shim_headers(Stanza, collection_shim(NodeName)); + Stnza; {true, SubIDs} -> - add_shim_headers(Stanza, lists:append(collection_shim(NodeName), subid_shim(SubIDs))) + add_shim_headers(Stanza, subid_shim(SubIDs)) end, lists:foreach(fun(To) -> ejabberd_router:route(From, jlib:make_jid(To), StanzaToSend) @@ -4244,11 +4244,6 @@ add_headers(#xmlel{name = Name, attrs = Attrs, children = Els}, HeaderName, Head #xmlel{name = Name, attrs = Attrs, children = lists:append(Els, [HeaderEl])}. -collection_shim(Node) -> - [#xmlel{name = <<"header">>, - attrs = [{<<"name">>, <<"Collection">>}], - children = [{xmlcdata, Node}]}]. - subid_shim(SubIds) -> [#xmlel{name = <<"header">>, attrs = [{<<"name">>, <<"SubId">>}], |