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

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

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 62f7bd4c6ac7609d12bcc84bb11eb28702897e11..1eea922396a717bd8938bef911e474e1ef9f7711 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -48,8 +48,6 @@ class Worker
         */
        public static function processQueue($run_cron = true)
        {
-               $a = \get_app();
-
                // Ensure that all "strtotime" operations do run timezone independent
                date_default_timezone_set('UTC');
 
@@ -372,7 +370,7 @@ class Worker
         */
        private static function execFunction($queue, $funcname, $argv, $method_call)
        {
-               $a = \get_app();
+               $a = DI::app();
 
                $argc = count($argv);
 
@@ -979,7 +977,7 @@ class Worker
                        return;
                }
 
-               $url = System::baseUrl()."/worker";
+               $url = DI::baseUrl() . '/worker';
                Network::fetchUrl($url, false, 1);
        }
 
@@ -1083,7 +1081,7 @@ class Worker
 
                $args = ['no_cron' => !$do_cron];
 
-               $a = get_app();
+               $a = DI::app();
                $process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath());
                $process->run($command, $args);