The last of the big workers moved ... delivery and notifier

[friendica.git] / include / redir.php

diff --git a/include/redir.php b/include/redir.php
index 692e3ad23a34d7380f5f0bf112798e2d327facbd..060d0e9bf30deadf86fbed96d49ba2eb61ca5a4e 100644 (file)
--- a/include/redir.php
+++ b/include/redir.php
@@ -1,5 +1,9 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 function auto_redir(App $a, $contact_nick) {
 
        // prevent looping
@@ -20,7 +24,7 @@ function auto_redir(App $a, $contact_nick) {
                //
                // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
 
-               $baseurl = App::get_baseurl();
+               $baseurl = System::baseUrl();
                $domain_st = strpos($baseurl, "://");
                if ($domain_st === false)
                        return;
@@ -36,7 +40,7 @@ function auto_redir(App $a, $contact_nick) {
                                dbesc($nurl)
                );
 
-               if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
+               if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
                        return;
                }
 
@@ -48,7 +52,7 @@ function auto_redir(App $a, $contact_nick) {
                       dbesc($baseurl)
                );
 
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        return;
                }