Merge remote-tracking branch 'upstream/develop' into contact-tabs

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index b59b36ee7d79267be9cff33bd8ddd0c7404d188b..d4ee97c4ff7a1b37998ed2ddacd3f6e91c624b8a 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -20,13 +20,11 @@
  */
 
 use Friendica\App;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
-use Friendica\Model\Contact;
 use Friendica\Module;
 use Friendica\Util\Strings;
 
@@ -119,36 +117,6 @@ function common_content(App $a)
                return $o;
        }
 
-       $id = 0;
-
-       $entries = [];
-       foreach ($common_friends as $common_friend) {
-               //get further details of the contact
-               $contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid);
-
-               // $rr['id'] is needed to use contact_photo_menu()
-               /// @TODO Adding '/" here avoids E_NOTICE on missing constants
-               $common_friend['id'] = $common_friend['cid'];
-
-               $photo_menu = Model\Contact::photoMenu($common_friend);
-
-               $entry = [
-                       'url'          => Model\Contact::magicLink($common_friend['url']),
-                       'itemurl'      => ($contact_details['addr'] ?? '') ?: $common_friend['url'],
-                       'name'         => $contact_details['name'],
-                       'thumb'        => Contact::getThumb($contact_details),
-                       'img_hover'    => $contact_details['name'],
-                       'details'      => $contact_details['location'],
-                       'tags'         => $contact_details['keywords'],
-                       'about'        => $contact_details['about'],
-                       'account_type' => Model\Contact::getAccountType($contact_details),
-                       'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
-                       'photo_menu'   => $photo_menu,
-                       'id'           => ++$id,
-               ];
-               $entries[] = $entry;
-       }
-
        $title = '';
        $tab_str = '';
        if ($cmd === 'loc' && $cid && local_user() == $uid) {
@@ -157,6 +125,14 @@ function common_content(App $a)
                $title = DI::l10n()->t('Common Friends');
        }
 
+       $entries = [];
+       foreach ($common_friends as $common_friend) {
+               $contact = Model\Contact::getByURLForUser($common_friend['url'], local_user());
+               if (!empty($contact)) {
+                       $entries[] = Module\Contact::getContactTemplateVars($contact);
+               }
+       }
+
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
        $o .= Renderer::replaceMacros($tpl, [