aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-11-29 10:13:47 +0100
committerMario Vavti <mario@mariovavti.com>2016-11-29 10:13:47 +0100
commit91e97468a096474afe0444135f789293f74c422c (patch)
tree0336c48e808960fc02baaa51a7f8ca5b8448ed2d /include
parentf9b732482d1776ba0c8cad593157589189f6bedd (diff)
parent4a9317db6e94e6f2d2d1a3074c7429d3e92377b5 (diff)
downloadvolse-hubzilla-91e97468a096474afe0444135f789293f74c422c.tar.gz
volse-hubzilla-91e97468a096474afe0444135f789293f74c422c.tar.bz2
volse-hubzilla-91e97468a096474afe0444135f789293f74c422c.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include')
-rw-r--r--include/zot.php8
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;