Merge pull request #6536 from annando/ap-forum-2

[friendica.git] / src / Worker / Cron.php

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 9b8eb1cfec8b11aa1be350f7522cf350b60193c7..b9a8c0f2ecf34258bb828a834ea662caeb733477 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -15,8 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class Cron
 {
        public static function execute($parameter = '', $generation = 0)
@@ -135,25 +133,24 @@ class Cron
        /**
         * @brief Poll contacts for unreceived messages
         *
-        * @todo Currently it seems as if the following parameter aren't used at all ...
+        * @todo  Currently it seems as if the following parameter aren't used at all ...
         *
-        * @param string $parameter Parameter (force, restart, ...) for the contact polling
+        * @param string  $parameter Parameter (force, restart, ...) for the contact polling
         * @param integer $generation
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function pollContacts($parameter, $generation) {
                $manual_id  = 0;
                $generation = 0;
                $force      = false;
-               $restart    = false;
 
                if ($parameter == 'force') {
                        $force = true;
                }
                if ($parameter == 'restart') {
-                       $restart = true;
                        $generation = intval($generation);
                        if (!$generation) {
-                               killme();
+                               exit();
                        }
                }
 
@@ -168,8 +165,6 @@ class Cron
 
                Addon::reload();
 
-               $d = DateTimeFormat::utcNow();
-
                // 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.