diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
| commit | 2108173e74c12ce590c87e673d3455f7a9b18de8 (patch) | |
| tree | 2fc06a9de42ac30c95aab864ecfd0fe2e7681d0c /include/follow.php | |
| parent | b03545f89939ef1c13ca7f5a950d52fcb7f2313f (diff) | |
| parent | 08900b730bd39c00e399696472d904c1d5e4ef0b (diff) | |
| download | volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.gz volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.bz2 volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/follow.php')
| -rw-r--r-- | include/follow.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/follow.php b/include/follow.php index 56d8294c5..0843802c5 100644 --- a/include/follow.php +++ b/include/follow.php @@ -226,6 +226,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } + $profile_assign = get_pconfig($uid,'system','profile_assign',''); + $r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook where abook_xchan = '%s' and abook_channel = %d limit 1", @@ -265,6 +267,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) 'abook_channel' => intval($uid), 'abook_closeness' => intval($closeness), 'abook_xchan' => $xchan_hash, + 'abook_profile' => $profile_assign, 'abook_feed' => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0), 'abook_created' => datetime_convert(), 'abook_updated' => datetime_convert(), |