Changed parameter order for "getbyURLForUser"

diff --git a/mod/common.php b/mod/common.php
index a54342ca0c7da9df6bcda376ace295d8db68b5d0..9b327f1bf81b149f091f50611eba2a08add2b894 100644 (file)
--- 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 d630d94a04ebb9722374ea2cdf1e975300e28dcc..ddc78d6eae024df2724a31dd3d7c4aa442584004 100644 (file)
--- 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 7db49c9ba59d49149e3182e3bddddf2f512e7dfc..2b7b1f67437c462bac72b8ecd84192cdd9241a95 100644 (file)
--- 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 d93b0c1b6d4b4a917de6f2611c2d78be48c1592c..c0b1d3b49a37d3baf1aaffd69245aec129965836 100644 (file)
--- 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 26531a1a3089b11b955bc07ed1187568d4160d00..208633272b3722be83e78837f69bcf10197ac121 100644 (file)
--- 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 7c8dec3895b10a609924a38b0b07c1c21922df06..afec920070d02f5149113e4322698fea4f5f276e 100644 (file)
--- 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 b876dacf4c6510fd6631a682e95ffc546815b82a..e8cd4768a65ae20f784116c17ba0283492f8db0e 100644 (file)
--- 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 3f5cf7c8391a966b2e504aa0bbdfbe48985f78c1..d2d2b3b0cf627a3b06057ae99e4c35ac3eed9f04 100644 (file)
--- 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 655fc9e2d50dd03aa89bed911b1113af61efec49..29329b22964ed5f4e9e6cdee18db63929780c5d9 100644 (file)
--- 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 8c1129448d4d5f9ee25e2e421d74352bf1f43a7f..60ba2b92e48595ce90d774f50b31ed598c4fa9cb 100644 (file)
--- 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 bf82e0427831fe37fc1da1fe320437793f9f0ce1..c9a76fef096edfe8272dd50df9f2da5bb7b9b0c6 100644 (file)
--- 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"]);