From 46a4208b3db1ea5889be453d04713f627b3a15c8 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 6 Mar 2018 11:39:49 -0800 Subject: [PATCH] don't add pending connections to the default privacy group until accepted --- include/zot.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/zot.php b/include/zot.php index 0cfc370a2..333a57c6c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -587,13 +587,16 @@ function zot_refresh($them, $channel = null, $force = false) { // If there is a default group for this channel, add this connection to it + // for pending connections this will happens at acceptance time. - $default_group = $channel['channel_default_group']; - if($default_group) { - require_once('include/group.php'); - $g = group_rec_byhash($channel['channel_id'],$default_group); - if($g) - group_add_member($channel['channel_id'],'',$x['hash'],$g['id']); + if(! intval($new_connection[0]['abook_pending'])) { + $default_group = $channel['channel_default_group']; + if($default_group) { + require_once('include/group.php'); + $g = group_rec_byhash($channel['channel_id'],$default_group); + if($g) + group_add_member($channel['channel_id'],'',$x['hash'],$g['id']); + } } unset($new_connection[0]['abook_id']);