From d011f747ff83a3626eea9d0c1fd7f97ec7e0e24a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 6 Nov 2021 00:07:07 -0400 Subject: [PATCH] Remove unused parameter $network in Model\User::getDefaultGroup --- src/Model/Contact.php | 4 ++-- src/Model/User.php | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 8d7799f63..50ae42418 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -2492,7 +2492,7 @@ class Contact $contact_id = $contact['id']; $result['cid'] = $contact_id; - Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id); + Group::addMember(User::getDefaultGroup($uid), $contact_id); // Update the avatar self::updateAvatar($contact_id, $ret['photo']); @@ -2699,7 +2699,7 @@ class Contact DI::intro()->save($intro); } - Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); + Group::addMember(User::getDefaultGroup($importer['uid']), $contact_record['id']); if (($user['notify-flags'] & Notification\Type::INTRO) && in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { diff --git a/src/Model/User.php b/src/Model/User.php index c43209b22..736612b0d 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -481,13 +481,12 @@ class User /** * Returns the default group for a given user and network * - * @param int $uid User id - * @param string $network network name + * @param int $uid User id * * @return int group id * @throws Exception */ - public static function getDefaultGroup($uid, $network = '') + public static function getDefaultGroup($uid) { $user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]); if (DBA::isResult($user)) {