Issue 3857: There is the possibility of a bad handling of dislikes

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index 9c2e6aeaa30d5f68f5b3f972befdb0e4845896c3..8b0fab77abfefedc5b0dc1c92abf016a03f3b794 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -42,12 +42,6 @@ function cron_run(&$argv, &$argc){
        // Expire and remove user entries
        proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "expire_and_remove_users");
 
-       // Check OStatus conversations
-       proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_mentions");
-
-       // Check every conversation
-       proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_conversations");
-
        // Call possible post update functions
        proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update");
 
@@ -84,7 +78,7 @@ function cron_run(&$argv, &$argc){
                proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums");
 
                // Delete all done workerqueue entries
-               dba::delete('workerqueue', array('done' => true));
+               dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'));
        }
 
        // Poll contacts
@@ -253,7 +247,7 @@ function cron_poll_contacts($argc, $argv) {
                        } else {
                                $priority = PRIORITY_LOW;
                        }
-                       proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', intval($contact['id']));
+                       proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', (int)$contact['id']);
                }
        }
 }