The function "construct_acl_data" isn't used at all, it seems. it is deactivated now

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index b21bf676bae999e7f80e9a120f4f8de206853555..cf5ed9a8156c28cd3e9a33fa8e449789f30c343a 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -27,12 +27,13 @@ function queue_run(&$argv, &$argc){
                logger('queue: start');
 
                // Handling the pubsubhubbub requests
-               proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
+               proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php');
 
                $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
                        INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
                        WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-               if ($r) {
+
+               if (dbm::is_result($r)) {
                        foreach ($r as $rr) {
                                logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
                                logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
@@ -50,7 +51,7 @@ function queue_run(&$argv, &$argc){
                if (dbm::is_result($r)) {
                        foreach ($r as $q_item) {
                                logger('Call queue for id '.$q_item['id']);
-                               proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
+                               proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", $q_item['id']);
                        }
                }
                return;