aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristophe Romain <chris.romain@gmail.com>2010-03-05 18:20:22 +0100
committerChristophe Romain <chris.romain@gmail.com>2010-03-05 18:20:22 +0100
commitd2d06403aca9a4e6ab29bf81c5deeaf7e3dd6b39 (patch)
treeb4ffa7c7d40305366d1c925173b04ffdb346e4e4 /src
parentadd extended stanza addressing 'replyto' on PEP (EJAB-1198) (thanks karim) (diff)
fix mistake in previous broadcast_stanza change
Diffstat (limited to 'src')
-rw-r--r--src/mod_pubsub/mod_pubsub.erl4
-rw-r--r--src/mod_pubsub/mod_pubsub_odbc.erl4
-rw-r--r--src/mod_pubsub/pubsub_odbc.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index d236e9121..646b3da9a 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -3116,8 +3116,8 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod
_ ->
?DEBUG("~p@~p has no session; can't deliver ~p to contacts", [LUser, LServer, BaseStanza])
end;
-broadcast_stanza(_Host, _Publisher, _Node, _NodeId, _Type, _NodeOptions, _SubsByDepth, _NotifyType, _BaseStanza, _SHIM) ->
- ok.
+broadcast_stanza(Host, Publisher, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) ->
+ broadcast_stanza(Host, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM).
subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
NodesToDeliver = fun(Depth, Node, Subs, Acc) ->
diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl
index e902b0141..70585ae6d 100644
--- a/src/mod_pubsub/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub/mod_pubsub_odbc.erl
@@ -2925,8 +2925,8 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod
_ ->
?DEBUG("~p@~p has no session; can't deliver ~p to contacts", [LUser, LServer, BaseStanza])
end;
-broadcast_stanza(_Host, _Publisher, _Node, _NodeId, _Type, _NodeOptions, _SubsByDepth, _NotifyType, _BaseStanza, _SHIM) ->
- ok.
+broadcast_stanza(Host, Publisher, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) ->
+ broadcast_stanza(Host, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM).
subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
NodesToDeliver = fun(Depth, Node, Subs, Acc) ->
diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch
index a9d8c81a8..36644cf04 100644
--- a/src/mod_pubsub/pubsub_odbc.patch
+++ b/src/mod_pubsub/pubsub_odbc.patch
@@ -1,5 +1,5 @@
---- mod_pubsub.erl 2010-03-05 17:51:32.000000000 +0100
-+++ mod_pubsub_odbc.erl 2010-03-05 17:51:57.000000000 +0100
+--- mod_pubsub.erl 2010-03-05 18:19:48.033276211 +0100
++++ mod_pubsub_odbc.erl 2010-03-05 18:20:02.694164397 +0100
@@ -42,7 +42,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18.