From 46304da5d7222fadec6d017a6c45e11e938d6bae Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Mon, 20 Jul 2009 15:19:51 +0000 Subject: [PATCH] fix get_entity_subscriptions result match SVN Revision: 2375 --- src/mod_pubsub/mod_pubsub.erl | 6 +++--- 1 file 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 ->