diff options
| author | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
| commit | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch) | |
| tree | c677adb7c0e8140bdb1e115a95d1aa23fdf734ed /include/poller.php | |
| parent | 311e35731c52102cbce3befc6343f179080ad38c (diff) | |
| parent | 8cacff69858c2ad097bafb80c93405e79c311edf (diff) | |
| download | volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2 volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip | |
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Diffstat (limited to 'include/poller.php')
| -rwxr-xr-x | include/poller.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/poller.php b/include/poller.php index 0ea0c9231..3e7a1e9b4 100755 --- a/include/poller.php +++ b/include/poller.php @@ -194,8 +194,8 @@ function poller_run($argv, $argc){ $update = true; break; } -// if((! $update) && (! $force)) -// continue; + if((! $update) && (! $force)) + continue; } // Check to see if we are running out of memory - if so spawn a new process and kill this one @@ -349,7 +349,7 @@ function poller_run($argv, $argc){ || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_FEED) ) { - // Upgrading DB fields from an older Friendika version + // Upgrading DB fields from an older Friendica version // Will only do this once per notify-enabled OStatus contact // or if relationship changes |