diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-12 12:10:09 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-12 12:10:09 +0530 |
| commit | 10db2f00f9f90cb7ee9fbd94a5c986427de779c2 (patch) | |
| tree | 9504ad13c592621521f7051fb06b5ca81ce1d757 /include/poller.php | |
| parent | b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (diff) | |
| parent | 2454028ef61a3ea1dd8308896c8bbf1f04f97ac9 (diff) | |
| download | volse-hubzilla-10db2f00f9f90cb7ee9fbd94a5c986427de779c2.tar.gz volse-hubzilla-10db2f00f9f90cb7ee9fbd94a5c986427de779c2.tar.bz2 volse-hubzilla-10db2f00f9f90cb7ee9fbd94a5c986427de779c2.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
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 " : ""); |