EOL removed

[friendica.git] / src / Module / AllFriends.php

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 5bade0c57925bfe21007b6037ca8ce1cd40471af..0a95256172220c83a86a6b4e0faf2100661bd22f 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -63,7 +63,7 @@ class AllFriends extends BaseModule
                }
 
                DI::page()['aside'] = "";
-               Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], 0, [], false));
+               Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], false));
 
                $total = Model\GContact::countAllFriends(local_user(), $cid);
 
@@ -79,7 +79,7 @@ class AllFriends extends BaseModule
                $entries = [];
                foreach ($friends as $friend) {
                        //get further details of the contact
-                       $contactDetails = array_merge($friend, Model\Contact::getByURLForUser($friend['url'], $uid, [], false));
+                       $contactDetails = Model\Contact::getByURLForUser($friend['url'], $uid) ?: $friend;
 
                        $connlnk = '';
                        // $friend[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photoMenu