From e374aecc46c74f9c499a9abddf9d111fdd0b6984 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 15 Jul 2020 17:22:12 +0000 Subject: [PATCH] Changed parameter order for "getbyURLForUser" --- mod/common.php | 4 ++-- mod/display.php | 2 +- mod/suggest.php | 2 +- src/Content/Item.php | 2 +- src/Core/Search.php | 6 +++--- src/Model/Contact.php | 2 +- src/Model/GContact.php | 2 +- src/Module/AllFriends.php | 2 +- src/Module/Contact/Hovercard.php | 2 +- src/Module/Profile/Contacts.php | 2 +- src/Protocol/DFRN.php | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mod/common.php b/mod/common.php index a54342ca0c..9b327f1bf8 100644 --- a/mod/common.php +++ b/mod/common.php @@ -57,7 +57,7 @@ function common_content(App $a) if (DBA::isResult($contact)) { DI::page()['aside'] = ""; - Model\Profile::load($a, "", Model\Contact::getByURLForUser($contact["url"], 0, [], false)); + Model\Profile::load($a, "", Model\Contact::getByURL($contact["url"], false)); } } else { $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]); @@ -124,7 +124,7 @@ function common_content(App $a) $entries = []; foreach ($common_friends as $common_friend) { //get further details of the contact - $contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid, [], false); + $contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid, false); // $rr['id'] is needed to use contact_photo_menu() /// @TODO Adding '/" here avoids E_NOTICE on missing constants diff --git a/mod/display.php b/mod/display.php index d630d94a04..ddc78d6eae 100644 --- a/mod/display.php +++ b/mod/display.php @@ -164,7 +164,7 @@ function display_fetchauthor($a, $item) $profiledata["about"] = ""; } - $profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), [], false)); + $profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), false)); if (!empty($profiledata["photo"])) { $profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]); diff --git a/mod/suggest.php b/mod/suggest.php index 7db49c9ba5..2b7b1f6743 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -104,7 +104,7 @@ function suggest_content(App $a) 'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk] ]; - $contact_details = array_merge($rr, Contact::getByURLForUser($rr["url"], local_user(), [], false)); + $contact_details = array_merge($rr, Contact::getByURLForUser($rr["url"], local_user(), false)); $entry = [ 'url' => Contact::magicLink($rr['url']), diff --git a/src/Content/Item.php b/src/Content/Item.php index d93b0c1b6d..c0b1d3b49a 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -150,7 +150,7 @@ class Item // Try to detect the contact in various ways if (strpos($name, 'http://') || strpos($name, '@')) { - $contact = Contact::getByURLForUser($name, $profile_uid, []); + $contact = Contact::getByURLForUser($name, $profile_uid); } else { $contact = false; $fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv']; diff --git a/src/Core/Search.php b/src/Core/Search.php index 26531a1a30..208633272b 100644 --- a/src/Core/Search.php +++ b/src/Core/Search.php @@ -77,7 +77,7 @@ class Search // Ensure that we do have a contact entry Contact::getIdForURL($user_data['url'] ?? ''); - $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), [], false); + $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), false); $result = new ContactResult( $user_data['name'] ?? '', @@ -143,7 +143,7 @@ class Search foreach ($profiles as $profile) { $profile_url = $profile['url'] ?? ''; - $contactDetails = Contact::getByURLForUser($profile_url, local_user(), [], false); + $contactDetails = Contact::getByURLForUser($profile_url, local_user(), false); $result = new ContactResult( $profile['name'] ?? '', @@ -232,7 +232,7 @@ class Search continue; } - $contact = Contact::getByURLForUser($row["nurl"], local_user(), [], false); + $contact = Contact::getByURLForUser($row["nurl"], local_user(), false); if ($contact["name"] == "") { $contact["name"] = end(explode("/", $urlParts["path"])); diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7c8dec3895..afec920070 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -238,7 +238,7 @@ class Contact * @param boolean $update true = always update, false = never update, null = update when not found or outdated * @return array contact array */ - public static function getByURLForUser(string $url, int $uid = 0, array $fields = [], $update = null) + public static function getByURLForUser(string $url, int $uid = 0, $update = null, array $fields = []) { if ($uid != 0) { $contact = self::getByURL($url, $update, $fields, $uid); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index b876dacf4c..e8cd4768a6 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -111,7 +111,7 @@ class GContact continue; } - $gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user(), [], false); + $gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user(), false); } DBA::close($results); return $gcontacts; diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php index 3f5cf7c839..d2d2b3b0cf 100644 --- a/src/Module/AllFriends.php +++ b/src/Module/AllFriends.php @@ -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 = array_merge($friend, Model\Contact::getByURLForUser($friend['url'], $uid, false)); $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 diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php index 655fc9e2d5..29329b2296 100644 --- a/src/Module/Contact/Hovercard.php +++ b/src/Module/Contact/Hovercard.php @@ -65,7 +65,7 @@ class Hovercard extends BaseModule // Search for contact data // Look if the local user has got the contact if (Session::isAuthenticated()) { - $contact = Contact::getByURLForUser($contact_url, local_user(), [], false); + $contact = Contact::getByURLForUser($contact_url, local_user(), false); } else { $contact = Contact::getByURL($contact_url, false); } diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php index 8c1129448d..60ba2b92e4 100644 --- a/src/Module/Profile/Contacts.php +++ b/src/Module/Profile/Contacts.php @@ -103,7 +103,7 @@ class Contacts extends BaseProfile continue; } - $contact_details = array_merge($contact, Contact::getByURLForUser($contact['url'], $a->profile['uid'], [], false)); + $contact_details = array_merge($contact, Contact::getByURLForUser($contact['url'], $a->profile['uid'], false)); $contacts[] = [ 'id' => $contact['id'], diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index bf82e04278..c9a76fef09 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -755,7 +755,7 @@ class DFRN { $author = $doc->createElement($element); - $contact = Contact::getByURLForUser($contact_url, $item["uid"], ['url', 'name', 'addr', 'photo']); + $contact = Contact::getByURLForUser($contact_url, $item["uid"], null, ['url', 'name', 'addr', 'photo']); if (!empty($contact)) { XML::addElement($doc, $author, "name", $contact["name"]); XML::addElement($doc, $author, "uri", $contact["url"]); -- 2.39.5