diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-10 15:10:09 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-10 15:10:09 -0500 |
| commit | a4de63ca923583b77cf2a4ad60f4893e006f90e4 (patch) | |
| tree | 31406e7dffabc54d2b49879272598236949793c7 /include | |
| parent | 9b13db1c4896e6a8b0a55195530f5449999e811d (diff) | |
| parent | 78040330b6be3681dd0d6fdd1d3d0960fd88bc06 (diff) | |
| download | volse-hubzilla-a4de63ca923583b77cf2a4ad60f4893e006f90e4.tar.gz volse-hubzilla-a4de63ca923583b77cf2a4ad60f4893e006f90e4.tar.bz2 volse-hubzilla-a4de63ca923583b77cf2a4ad60f4893e006f90e4.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'include')
| -rw-r--r-- | include/zot.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/zot.php b/include/zot.php index 25e30ccbc..c11cace2a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -589,13 +589,16 @@ function zot_refresh($them, $channel = null, $force = false) { // If there is a default group for this channel, add this connection to it - - $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']); + // for pending connections this will happens at acceptance time. + + 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']); |