aboutsummaryrefslogtreecommitdiff
path: root/src/node_flat_sql.erl
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2016-09-08 16:27:16 +0200
committerChristophe Romain <christophe.romain@process-one.net>2016-09-08 16:27:16 +0200
commitad39da0b0a90dab159625bfb3ba47727582cd8b8 (patch)
treeaa15d943f908a8f3cb6b16f831ec097f4f54940e /src/node_flat_sql.erl
parentFix message routing from subscribers (diff)
Full jid entity subscriptions should include bare jid records (#1284)
Diffstat (limited to '')
-rw-r--r--src/node_flat_sql.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
index fa4af4d57..1dd44d4d8 100644
--- a/src/node_flat_sql.erl
+++ b/src/node_flat_sql.erl
@@ -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),