X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=9d441f18a7c5aaa81d343ca08a14260df5d06c34;hb=2db6171641bd3cd468b965470d9da56e82512e00;hp=c93edf3b3097666b60dc4e8770f70f10dbef0809;hpb=761e94d134cf841a013127ba5070dcba525e0c6d;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index c93edf3b30..9d441f18a7 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -14,8 +14,6 @@ use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 function common_content(App $a)
 {
 	$o = '';
@@ -49,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
@@ -119,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'],