Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index c4f05b2dc9716fd555d4c0c449d63f6c03b87898..84481b9fa5c858b9d194f3657b46cd55b5502a99 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -5,7 +5,6 @@
 namespace Friendica\Model;
 
 use Friendica\App\BaseURL;
-use Friendica\BaseObject;
 use Friendica\Content\Pager;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
@@ -18,7 +17,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Network\Probe;
-use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
@@ -33,7 +31,7 @@ use Friendica\Util\Strings;
 /**
  * @brief functions for interacting with a contact
  */
-class Contact extends BaseObject
+class Contact
 {
        /**
         * @deprecated since version 2019.03
@@ -2268,13 +2266,13 @@ class Contact extends BaseObject
 
                if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
                        if ($interactive) {
-                               if (strlen($a->getURLPath())) {
+                               if (strlen(DI::baseUrl()->getUrlPath())) {
                                        $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
                                } else {
-                                       $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName());
+                                       $myaddr = bin2hex($a->user['nickname'] . '@' . DI::baseUrl()->getHostname());
                                }
 
-                               $a->internalRedirect($ret['request'] . "&addr=$myaddr");
+                               DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr");
 
                                // NOTREACHED
                        }