diff options
author | Andrew Manning <andrew@reticu.li> | 2016-11-29 22:13:24 -0500 |
---|---|---|
committer | Andrew Manning <andrew@reticu.li> | 2016-11-29 22:13:24 -0500 |
commit | 50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794 (patch) | |
tree | 4f38196c3f0b45d6aa87149ca27119481f470c60 /include/zot.php | |
parent | b32bce9be22ca9c0c2b47e4a43282e9289c236ff (diff) | |
parent | 8c87f32b381ec0be066cdd0e6ca4fe50079bbd16 (diff) | |
download | volse-hubzilla-50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794.tar.gz volse-hubzilla-50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794.tar.bz2 volse-hubzilla-50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794.zip |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php index 2cd60e815..ee4836d6c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -425,6 +425,10 @@ function zot_refresh($them, $channel = null, $force = false) { $next_birthday = NULL_DATE; } + + // Keep original perms to check if we need to notify them + $previous_perms = get_all_perms($channel['channel_id'],$x['hash']); + $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", dbesc($x['hash']), intval($channel['channel_id']) @@ -488,10 +492,6 @@ function zot_refresh($them, $channel = null, $force = false) { } } - // Keep original perms to check if we need to notify them - $previous_perms = get_all_perms($channel['channel_id'],$x['hash']); - - $closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness'); if($closeness === false) $closeness = 80; |