Fixed count, added to-do

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index f24df5252d4479bf9c4105039b706c2d0bd061f5..3da17d4a6e481d7099b9eb8e4e683477bf7f8f9b 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -671,7 +671,7 @@ class Worker
                                $waiting_processes = 0;
                                // Now adding all processes with workerqueue entries
                                $stamp = (float)microtime(true);
-                               $jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow());
+                               $jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
                                self::$db_duration += (microtime(true) - $stamp);
                                self::$db_duration_stat += (microtime(true) - $stamp);
                                while ($entry = DBA::fetch($jobs)) {

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 75d820517fc08dd5709f12f7365f9af3d2b29c3c..4d9260d3e9a81c0096bb2a0cf1e89cdd3ef311d3 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1592,6 +1592,7 @@ class Contact extends BaseObject
                        return true;
                }
 
+               /// @todo Add tests for Diaspora endpoints as well
                return false;
        }