Merge pull request #2016 from fabrixxm/template_vars_hook

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index 712befb1fff58097394d6b04ea8970955bb0361f..46067d76da05f88c10b4173c212466abee82c7e0 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -215,15 +215,16 @@ function cron_run(&$argv, &$argc){
        if(! $interval)
                $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
 
+       // If we are using the worker we don't need a delivery interval
+       if (get_config("system", "worker"))
+               $interval = false;
+
        $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 
        reload_plugins();
 
        $d = datetime_convert();
 
-       if(! $restart)
-               proc_run('php','include/cronhooks.php');
-
        // Only poll from those with suitable relationships,
        // and which have a polling address and ignore Diaspora since
        // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
@@ -335,6 +336,6 @@ function cron_run(&$argv, &$argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  cron_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+       cron_run($_SERVER["argv"],$_SERVER["argc"]);
+       killme();
 }