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 147c1f3cab46b68ba41d0e96e248e0deed70a841..4e984baa6f9ab52f3bbc917706c120a3dbd0230c 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -255,7 +255,7 @@ class Profile
                 * By now, the contact block isn't shown, when a different profile is given
                 * But: When this profile was on the same server, then we could display the contacts
                 */
-               DI::page()['aside'] .= self::sidebar($profile, $block, $show_contacts);
+               DI::page()['aside'] .= self::getVCardHtml($profile, $block, $show_contacts);
 
                return $profile;
        }
@@ -281,7 +281,7 @@ class Profile
         * @hooks 'profile_sidebar'
         *      array $arr
         */
-       private static function sidebar(array $profile, bool $block, bool $show_contacts)
+       public static function getVCardHtml(array $profile, bool $block, bool $show_contacts)
        {
                $o = '';
                $location = false;
@@ -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);