diff options
| author | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
| commit | 78429926bcf1ab7e8a4d35d0093ba666b3568708 (patch) | |
| tree | f9f1d219ecbbaa52982e1f26b842e1e824b68c85 /include/poller.php | |
| parent | a2ea560bf397902ce5608daabf101d0bcf813f13 (diff) | |
| parent | df3574663944f50820e2d50cfb9d87f505ceff54 (diff) | |
| download | volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.gz volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.bz2 volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/poller.php')
| -rw-r--r-- | include/poller.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php index f6553c846..6b12445d1 100644 --- a/include/poller.php +++ b/include/poller.php @@ -126,7 +126,9 @@ function poller_run($argv, $argc){ $force = true; } - $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); + $interval = intval(get_config('system','poll_interval')); + if(! $interval) + $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); |