25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00

Full jid entity subscriptions should include bare jid records (#1284)

This commit is contained in:
Christophe Romain 2016-09-08 16:27:16 +02:00
parent 36ab9cc2ea
commit ad39da0b0a

View File

@ -946,8 +946,9 @@ select_affiliation_subscriptions(Nidx, JID, JID) ->
select_affiliation_subscriptions(Nidx, JID);
select_affiliation_subscriptions(Nidx, GenKey, SubKey) ->
{result, Affiliation} = get_affiliation(Nidx, GenKey),
{result, Subscriptions} = get_subscriptions(Nidx, SubKey),
{Affiliation, Subscriptions}.
{result, BareJidSubs} = get_subscriptions(Nidx, GenKey),
{result, FullJidSubs} = get_subscriptions(Nidx, SubKey),
{Affiliation, BareJidSubs++FullJidSubs};
update_affiliation(Nidx, JID, Affiliation) ->
J = encode_jid(JID),