Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index e6fd14e07ca5dc1c7802c05bd52108bff764f4e1..f5375258bf140a4de57600ef6188fe51dee19941 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -13,9 +13,7 @@ function update_queue_time($id) {
 
 function remove_queue_item($id) {
        logger('queue: remove queue item ' . $id);
-       q("DELETE FROM `queue` WHERE `id` = %d",
-               intval($id)
-       );
+       dba::delete('queue', ['id' => $id]);
 }
 
 /**
@@ -26,8 +24,6 @@ function remove_queue_item($id) {
  * @return bool The communication with this contact has currently problems
  */
 function was_recently_delayed($cid) {
-       $was_delayed = false;
-
        // Are there queue entries that were recently added?
        $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
                AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
@@ -61,7 +57,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
                $batch_queue = 1000;
        }
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+       $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
                WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
                intval($cid)
        );