diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
| commit | 4471f580d7a50126d42690f05e81a75f7bbf8084 (patch) | |
| tree | 54e4fd3146a3978de744a39de6b7938d763852dd /include/follow.php | |
| parent | e5141dd91bf483b0458b6f9226b994afbee23524 (diff) | |
| parent | e1fdac32782de11e443c7398ff3fb9870fa9b2d9 (diff) | |
| download | volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.gz volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.bz2 volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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(), |