Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 925de3fe5b04994cb6102b425850e5d9d6c3e810..b631d2acd15637dad371c7cb122be456d45e22bf 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -39,7 +39,7 @@ function poller_run($argv, $argc){
                return;
        }
 
-       if (App::maxload_reached()) {
+       if ($a->maxload_reached()) {
                return;
        }
 
@@ -213,7 +213,7 @@ function poller_max_connections_reached() {
        // The processlist only shows entries of the current user
        if ($max != 0) {
                $r = q("SHOW PROCESSLIST");
-               if (!$r)
+               if (!dbm::is_result($r))
                        return false;
 
                $used = count($r);
@@ -484,7 +484,7 @@ function call_worker() {
                return;
        }
 
-       $url = get_app()->get_baseurl()."/worker";
+       $url = App::get_baseurl()."/worker";
        fetch_url($url, false, $redirects, 1);
 }