]> granicus.if.org Git - ejabberd/commitdiff
remove deferred Collection shim header
authorChristophe Romain <christophe.romain@process-one.net>
Tue, 21 Apr 2015 14:11:00 +0000 (16:11 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Tue, 21 Apr 2015 14:11:00 +0000 (16:11 +0200)
src/mod_pubsub.erl

index d5398fadf439483ff772881b9ba0001ff7c5827f..e266e89be196c524c3fd98c16eb9ac9a3f7ac222 100644 (file)
@@ -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">>}],