Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  poller refactor: continue not valid in this context

* master:
This commit is contained in:
Simon L'nu 2012-04-28 15:46:16 -04:00
commit 9413900a9f

View file

@ -107,7 +107,7 @@ function onepoll_run($argv, $argc){
intval($importer_uid)
);
if(! count($r))
continue;
return;
$importer = $r[0];