aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2009-07-20 15:19:51 +0000
committerChristophe Romain <christophe.romain@process-one.net>2009-07-20 15:19:51 +0000
commit46304da5d7222fadec6d017a6c45e11e938d6bae (patch)
treecde6fb238f9ae84e6f75385683c3e0d47ecfabb2
parentmoved some log reports from error to debug level (thanks to Evgeniy Khramtsov) (diff)
fix get_entity_subscriptions result match
SVN Revision: 2375
-rw-r--r--src/mod_pubsub/mod_pubsub.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index d8e193548..3ad2e254e 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -458,7 +458,7 @@ send_loop(State) ->
lists:foreach(fun(PType) ->
{result, Subscriptions} = node_action(Host, PType, get_entity_subscriptions, [Host, JID]),
lists:foreach(
- fun({Node, subscribed, SubJID}) ->
+ fun({Node, subscribed, _, SubJID}) ->
if (SubJID == LJID) or (SubJID == BJID) ->
#pubsub_node{options = Options, type = Type, id = NodeId} = Node,
case get_option(Options, send_last_published_item) of
@@ -767,7 +767,7 @@ handle_cast({remove_user, LUser, LServer}, State) ->
lists:foreach(fun(PType) ->
{result, Subscriptions} = node_action(Host, PType, get_entity_subscriptions, [Host, Owner]),
lists:foreach(fun
- ({#pubsub_node{nodeid = {H, N}}, subscribed, JID}) ->
+ ({#pubsub_node{nodeid = {H, N}}, subscribed, _, JID}) ->
unsubscribe_node(H, N, Owner, JID, all);
(_) ->
ok
@@ -788,7 +788,7 @@ handle_cast({unsubscribe, Subscriber, Owner}, State) ->
lists:foreach(fun(PType) ->
{result, Subscriptions} = node_action(Host, PType, get_entity_subscriptions, [Host, Subscriber]),
lists:foreach(fun
- ({Node, subscribed, JID}) ->
+ ({Node, subscribed, _, JID}) ->
#pubsub_node{options = Options, owners = Owners, type = Type, id = NodeId} = Node,
case get_option(Options, access_model) of
presence ->