Rename DBA::is_result to DBA::isResult

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 25c963fabcb4fa7a55d4108add1e2a289cf0dd3a..1a344ac541352e17ca7b475b0d4beb9f93526482 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -9,7 +9,6 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\PushSubscriber;
 use Friendica\Model\Queue as QueueModel;
 use Friendica\Model\User;
@@ -36,11 +35,11 @@ class Queue
                        // Handling the pubsubhubbub requests
                        PushSubscriber::requeue();
 
-                       $r = DBA::inArray(DBA::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
+                       $r = DBA::toArray(DBA::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
 
                        Addon::callHooks('queue_predeliver', $r);
 
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                foreach ($r as $q_item) {
                                        logger('Call queue for id ' . $q_item['id']);
                                        Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
@@ -53,12 +52,12 @@ class Queue
 
                // delivering
                $q_item = DBA::selectFirst('queue', [], ['id' => $queue_id]);
-               if (!DBM::is_result($q_item)) {
+               if (!DBA::isResult($q_item)) {
                        return;
                }
 
                $contact = DBA::selectFirst('contact', [], ['id' => $q_item['cid']]);
-               if (!DBM::is_result($contact)) {
+               if (!DBA::isResult($contact)) {
                        QueueModel::removeItem($q_item['id']);
                        return;
                }
@@ -98,7 +97,7 @@ class Queue
                }
 
                $user = DBA::selectFirst('user', [], ['uid' => $contact['uid']]);
-               if (!DBM::is_result($user)) {
+               if (!DBA::isResult($user)) {
                        QueueModel::removeItem($q_item['id']);
                        return;
                }