aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-24 14:55:39 -0800
committerzotlabs <mike@macgirvin.com>2017-11-24 14:55:39 -0800
commitfda5231a719025c0e2d7cc3954ebbab5b0d53586 (patch)
tree010ad3c43aaa5e5637e6ead7abbad681da32eca2 /include
parent874cff1a873c306f4174b4910b02de5795a037ca (diff)
downloadvolse-hubzilla-fda5231a719025c0e2d7cc3954ebbab5b0d53586.tar.gz
volse-hubzilla-fda5231a719025c0e2d7cc3954ebbab5b0d53586.tar.bz2
volse-hubzilla-fda5231a719025c0e2d7cc3954ebbab5b0d53586.zip
default profile assign
Diffstat (limited to 'include')
-rw-r--r--include/follow.php3
-rw-r--r--include/zot.php2
2 files changed, 5 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(),
diff --git a/include/zot.php b/include/zot.php
index 40e303bf1..d60494d94 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -394,6 +394,7 @@ function zot_refresh($them, $channel = null, $force = false) {
$next_birthday = NULL_DATE;
}
+ $profile_assign = get_pconfig($channel['channel_id'],'system','profile_assign','');
// Keep original perms to check if we need to notify them
$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
@@ -455,6 +456,7 @@ function zot_refresh($them, $channel = null, $force = false) {
'abook_channel' => intval($channel['channel_id']),
'abook_closeness' => intval($closeness),
'abook_xchan' => $x['hash'],
+ 'abook_profile' => $profile_assign,
'abook_created' => datetime_convert(),
'abook_updated' => datetime_convert(),
'abook_dob' => $next_birthday,