From: Christophe Romain <christophe.romain@process-one.net>
Date: Thu, 8 Sep 2016 14:27:16 +0000 (+0200)
Subject: Full jid entity subscriptions should include bare jid records (#1284)
X-Git-Tag: 16.09~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad39da0b0a90dab159625bfb3ba47727582cd8b8;p=ejabberd

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

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),