Use visibility tags input for the default ACL selector

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 1c4032f11f411e49fbe0d6e81a8598cad21b827d..9d441f18a7c5aaa81d343ca08a14260df5d06c34 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -47,7 +47,7 @@ function common_content(App $a)
                $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
                if (DBA::isResult($contact)) {
-                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("vcard-widget.tpl"), [
+                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("widget/vcard.tpl"), [
                                '$name'  => $contact['name'],
                                '$photo' => $contact['photo'],
                                'url'    => 'contact/' . $cid
@@ -117,8 +117,8 @@ function common_content(App $a)
                $photo_menu = Model\Contact::photoMenu($common_friend);
 
                $entry = [
-                       'url'          => $common_friend['url'],
-                       'itemurl'      => defaults($contact_details, 'addr', $common_friend['url']),
+                       'url'          => Model\Contact::magicLink($common_friend['url']),
+                       'itemurl'      => ($contact_details['addr'] ?? '') ?: $common_friend['url'],
                        'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
                        'img_hover'    => $contact_details['name'],