diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 2dd4cc0c7..e0b54ded2 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -3112,6 +3112,7 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod end, [{U, S, R} || R <- user_resources(U, S)]); false -> ejabberd_router:route(Sender, jlib:make_jid(U, S, ""), StanzaToSend) + end end) end, Contacts); _ -> diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index 9acebf45c..a6dca0035 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.erl @@ -2921,6 +2921,7 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod end, [{U, S, R} || R <- user_resources(U, S)]); false -> ejabberd_router:route(Sender, jlib:make_jid(U, S, ""), StanzaToSend) + end end) end, Contacts); _ -> diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch index f12ff3619..61d2eb005 100644 --- a/src/mod_pubsub/pubsub_odbc.patch +++ b/src/mod_pubsub/pubsub_odbc.patch @@ -1,5 +1,5 @@ ---- mod_pubsub.erl 2010-03-08 15:16:09.000000000 +0100 -+++ mod_pubsub_odbc.erl 2010-03-08 15:16:19.000000000 +0100 +--- mod_pubsub.erl 2010-03-08 15:38:53.000000000 +0100 ++++ mod_pubsub_odbc.erl 2010-03-08 15:39:03.000000000 +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. @@ -658,7 +658,7 @@ _ -> Acc end; (_, Acc) -> -@@ -3233,6 +3042,30 @@ +@@ -3234,6 +3043,30 @@ Result end. @@ -689,7 +689,7 @@ %% @spec (Host, Options) -> MaxItems %% Host = host() %% Options = [Option] -@@ -3628,7 +3461,13 @@ +@@ -3629,7 +3462,13 @@ tree_action(Host, Function, Args) -> ?DEBUG("tree_action ~p ~p ~p",[Host,Function,Args]), Fun = fun() -> tree_call(Host, Function, Args) end, @@ -704,7 +704,7 @@ %% @doc

node plugin call.

node_call(Type, Function, Args) -> -@@ -3648,13 +3487,13 @@ +@@ -3649,13 +3488,13 @@ node_action(Host, Type, Function, Args) -> ?DEBUG("node_action ~p ~p ~p ~p",[Host,Type,Function,Args]), @@ -720,7 +720,7 @@ case tree_call(Host, get_node, [Host, Node]) of N when is_record(N, pubsub_node) -> case Action(N) of -@@ -3667,8 +3506,14 @@ +@@ -3668,8 +3507,14 @@ end end, Trans). @@ -737,7 +737,7 @@ {result, Result} -> {result, Result}; {error, Error} -> {error, Error}; {atomic, {result, Result}} -> {result, Result}; -@@ -3676,6 +3521,15 @@ +@@ -3677,6 +3522,15 @@ {aborted, Reason} -> ?ERROR_MSG("transaction return internal error: ~p~n", [{aborted, Reason}]), {error, ?ERR_INTERNAL_SERVER_ERROR}; @@ -753,7 +753,7 @@ {'EXIT', Reason} -> ?ERROR_MSG("transaction return internal error: ~p~n", [{'EXIT', Reason}]), {error, ?ERR_INTERNAL_SERVER_ERROR}; -@@ -3684,6 +3538,17 @@ +@@ -3685,6 +3539,17 @@ {error, ?ERR_INTERNAL_SERVER_ERROR} end.