Merge pull request #7039 from annando/api-reshare-quote

[friendica.git] / mod / allfriends.php

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 80da130480444f2292701e1e0a286e13dba844e4..ce648cc25a4844f7e428b918379c005937d06041 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -60,8 +60,6 @@ function allfriends_content(App $a)
                //get further details of the contact
                $contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid, $rr);
 
-               $photo_menu = '';
-
                $connlnk = '';
                // $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
                // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
@@ -77,11 +75,11 @@ function allfriends_content(App $a)
                }
 
                $entry = [
-                       'url'          => $rr['url'],
+                       'url'          => Model\Contact::magicLink($rr['url']),
                        'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
-                       'name'         => htmlentities($contact_details['name']),
+                       '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'],
@@ -98,9 +96,7 @@ function allfriends_content(App $a)
        $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
-
        $o .= Renderer::replaceMacros($tpl, [
-               //'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
                '$tab_str' => $tab_str,
                '$contacts' => $entries,
                '$paginate' => $pager->renderFull($total),