diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2015-03-22 16:34:40 +0100 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2015-03-22 16:34:40 +0100 |
| commit | 82fb1ca0caaae72b77b641d22e51d5ae1b188183 (patch) | |
| tree | a2ecee4e65bc80300c62b5b327965b8118117ad3 /include/follow.php | |
| parent | ff5c3b009fa25e87e294cd458d3de4b677270c64 (diff) | |
| parent | e345d6793d5f6910dd230f661ca5d1a837b1b504 (diff) | |
| download | volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.gz volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.bz2 volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.zip | |
Merge pull request #8 from friendica/master
merging red master into nuvola.red
Diffstat (limited to 'include/follow.php')
| -rw-r--r-- | include/follow.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/follow.php b/include/follow.php index 2d6791420..fd4e1597a 100644 --- a/include/follow.php +++ b/include/follow.php @@ -227,10 +227,16 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) ); } else { - $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_flags, abook_their_perms, abook_my_perms, abook_created, abook_updated ) - values( %d, %d, '%s', %d, %d, %d, '%s', '%s' ) ", + + $closeness = get_pconfig($uid,'system','new_abook_closeness'); + if($closeness === false) + $closeness = 80; + + $r = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_flags, abook_their_perms, abook_my_perms, abook_created, abook_updated ) + values( %d, %d, %d, '%s', %d, %d, %d, '%s', '%s' ) ", intval($aid), intval($uid), + intval($closeness), dbesc($xchan_hash), intval(($is_http) ? ABOOK_FLAG_FEED : 0), intval(($is_http) ? $their_perms|PERMS_R_STREAM|PERMS_A_REPUBLISH : $their_perms), |