From: Christophe Romain Date: Tue, 25 Nov 2008 23:05:26 +0000 (+0000) Subject: pubsub/pep: get_node_affiliations resultset bugfix X-Git-Tag: v2.1.0~18^2~536 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e68a7312194b4fada3f1846bc2604f8ff6f10c54;p=ejabberd pubsub/pep: get_node_affiliations resultset bugfix SVN Revision: 1684 --- diff --git a/ChangeLog b/ChangeLog index 98dfea079..ed9072a86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-17 Christophe Romain + + * src/mod_pubsub/node_pep.erl: Fix get_node_affiliations resultset to + owner (Thanks to Michal Schmidt) + 2008-11-24 Evgeniy Khramtsov * src/eldap/Makefile.in: added +optimize and +driver diff --git a/src/mod_pubsub/node_pep.erl b/src/mod_pubsub/node_pep.erl index 6d2d2709e..1c1bff7d7 100644 --- a/src/mod_pubsub/node_pep.erl +++ b/src/mod_pubsub/node_pep.erl @@ -170,14 +170,9 @@ get_entity_affiliations(_Host, Owner) -> OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), node_default:get_entity_affiliations(OwnerKey, Owner). -get_node_affiliations(_Host, Node) -> - States = mnesia:match_object( - #pubsub_state{stateid = {'_', {'_', Node}}, - _ = '_'}), - Tr = fun(#pubsub_state{stateid = {J, {_, _}}, affiliation = A}) -> - {J, A} - end, - {result, lists:map(Tr, States)}. +get_node_affiliations(Host, Node) -> + OwnerKey = jlib:jid_remove_resource(Host), + node_default:get_node_affiliations(OwnerKey, Node). get_affiliation(_Host, Node, Owner) -> OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)),