From 961049f5faf04edcf3dc5485e76d81460b929efb Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Nov 2014 12:16:13 -0800 Subject: revert that bit --- include/poller.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'include') diff --git a/include/poller.php b/include/poller.php index 1734af7d9..026d84c62 100644 --- a/include/poller.php +++ b/include/poller.php @@ -263,7 +263,7 @@ function poller_run($argv, $argc){ ); - $contacts = q("SELECT abook_id, abook_flags, abook_network, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel + $contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel FROM abook LEFT JOIN account on abook_account = account_id where 1 $sql_extra AND (( abook_flags & %d ) OR ( abook_flags = %d )) @@ -357,12 +357,6 @@ function poller_run($argv, $argc){ if((! $update) && (! $force)) continue; - // we handled feed contacts earlier - now filter out anything else that - // doesn't require polling to keep the process count down. - - if($contact['abook_network'] !== 'zot') - continue; - proc_run('php','include/onepoll.php',$contact['abook_id']); if($interval) @time_sleep_until(microtime(true) + (float) $interval); -- cgit v1.2.3