Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index b335e296dbee1ec1d3250e16b2f159812723bd12..6b6090e19beedef238ac97652a75a628e5ef4019 100644 (file)
--- 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 = '';
@@ -50,12 +48,12 @@ function common_content(App $a)
 
                if (DBA::isResult($contact)) {
                        $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("vcard-widget.tpl"), [
-                               '$name'  => htmlentities($contact['name']),
+                               '$name'  => $contact['name'],
                                '$photo' => $contact['photo'],
                                'url'    => 'contact/' . $cid
                        ]);
 
-                       if (!x($a->page, 'aside')) {
+                       if (empty($a->page['aside'])) {
                                $a->page['aside'] = '';
                        }
                        $a->page['aside'] .= $vcard_widget;
@@ -119,11 +117,11 @@ function common_content(App $a)
                $photo_menu = Model\Contact::photoMenu($common_friend);
 
                $entry = [
-                       'url'          => $common_friend['url'],
+                       'url'          => Model\Contact::magicLink($common_friend['url']),
                        'itemurl'      => defaults($contact_details, 'addr', $common_friend['url']),
                        'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-                       'img_hover'    => htmlentities($contact_details['name']),
+                       'img_hover'    => $contact_details['name'],
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],