diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-15 17:34:03 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-15 17:34:03 +0200 |
| commit | 05ed20d336c505520fde94e44789d817d136c6f4 (patch) | |
| tree | de50e60e65b70cef71214e1ae0ee82aaa41b25d2 | |
| parent | 9a0dff08bc488646602424fbd030bfd097e8cda9 (diff) | |
| parent | 47fc0c79588d55a207dc39ae8062ec55382e2564 (diff) | |
| download | volse-hubzilla-05ed20d336c505520fde94e44789d817d136c6f4.tar.gz volse-hubzilla-05ed20d336c505520fde94e44789d817d136c6f4.tar.bz2 volse-hubzilla-05ed20d336c505520fde94e44789d817d136c6f4.zip | |
Merge branch 'dev' into sabre32
| -rw-r--r-- | include/follow.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/follow.php b/include/follow.php index 0c3973175..e5a74f85e 100644 --- a/include/follow.php +++ b/include/follow.php @@ -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'); diff --git a/include/zot.php b/include/zot.php index af79b5723..043139e2f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -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']); |