Merge pull request #10787 from fabrixxm/issue/10767

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 660cc5fb3d135d60870ba21116af68091119db38..4e984baa6f9ab52f3bbc917706c120a3dbd0230c 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -406,7 +406,7 @@ class Profile
                }
 
                if (!$block && $show_contacts) {
-                       $contact_block = ContactBlock::getHTML($profile);
+                       $contact_block = ContactBlock::getHTML($profile, local_user());
 
                        if (is_array($profile) && !$profile['hide-friends']) {
                                $contact_count = DBA::count('contact', [
@@ -742,7 +742,7 @@ class Profile
                        $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
                        // We have to check if the remote server does understand /magic without invoking something
-                       $serverret = DI::httpRequest()->get($basepath . '/magic');
+                       $serverret = DI::httpClient()->get($basepath . '/magic');
                        if ($serverret->isSuccess()) {
                                Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
                                System::externalRedirect($magic_path);