aboutsummaryrefslogtreecommitdiffstats
path: root/include/poller.php
diff options
context:
space:
mode:
authorHauke Zuehl <hzuehl@phone-talk.de>2012-06-16 18:04:59 +0200
committerHauke Zuehl <hzuehl@phone-talk.de>2012-06-16 18:04:59 +0200
commitf9a40ccbdea69fc7ffcbdc87356d535c67371210 (patch)
tree18eca4019eb8e64badb7035ab782b729b706cd64 /include/poller.php
parent1231dd72f02fdec59b78ed9a6408887c2ae0b8d4 (diff)
parent4faf0e609fe03095069c7a4bcdfc3496e4a28627 (diff)
downloadvolse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.gz
volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.bz2
volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/poller.php')
-rw-r--r--include/poller.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/poller.php b/include/poller.php
index 6b12445d1..fefc9b381 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -201,8 +201,8 @@ function poller_run($argv, $argc){
if($contact['subhub']) {
- $interval = get_config('system','pushpoll_frequency');
- $contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+ $poll_interval = get_config('system','pushpoll_frequency');
+ $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
$hub_update = false;
if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)