Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Christophe Romain 2016-09-08 16:27:16 +02:00
parent 36ab9cc2ea
commit ad39da0b0a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/node_flat_sql.erl
View File

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