harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't add pending connections to the default privacy group until accepted

Browse Source
This commit is contained in:
zotlabs 2018-03-06 11:39:49 -08:00 committed by Mario Vavti
parent 1d3d713c1c
commit 46a4208b3d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/zot.php
View File

@ -587,7 +587,9 @@ function zot_refresh($them, $channel = null, $force = false) {
// If there is a default group for this channel, add this connection to it // If there is a default group for this channel, add this connection to it
// for pending connections this will happens at acceptance time.
if(! intval($new_connection[0]['abook_pending'])) {
$default_group = $channel['channel_default_group']; $default_group = $channel['channel_default_group'];
if($default_group) { if($default_group) {
require_once('include/group.php'); require_once('include/group.php');
@ -595,6 +597,7 @@ function zot_refresh($them, $channel = null, $force = false) {
if($g) if($g)
group_add_member($channel['channel_id'],'',$x['hash'],$g['id']); group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
} }
}
unset($new_connection[0]['abook_id']); unset($new_connection[0]['abook_id']);
unset($new_connection[0]['abook_account']); unset($new_connection[0]['abook_account']);