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

Merge remote-tracking branch 'upstream/dev' into wiki

Browse Source
This commit is contained in:
Andrew Manning
2016-06-15 21:48:47 -04:00
parent 688171d016 476116a972
commit fc7c4e64ff
7 changed files with 162 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/follow.php
View File

@@ -275,7 +275,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
call_hooks('follow', $arr);
/** If there is a default group for this channel, add this member to it */
/** If there is a default group for this channel, add this connection to it */
if($default_group) {
require_once('include/group.php');

10
include/zot.php
View File

@@ -538,6 +538,16 @@ function zot_refresh($them, $channel = null, $force = false) {
Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
}
/** 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']);
}
unset($new_connection[0]['abook_id']);
unset($new_connection[0]['abook_account']);
unset($new_connection[0]['abook_channel']);