mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Remove unused parameter $network in Model\User::getDefaultGroup

Browse source
This commit is contained in:
Hypolite Petovan 2021-11-06 00:07:07 -04:00
parent 53ca59d9b6
commit d011f747ff
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact.php
View file

@ -2492,7 +2492,7 @@ class Contact
$contact_id = $contact['id']; $contact_id = $contact['id'];
$result['cid'] = $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 // Update the avatar
self::updateAvatar($contact_id, $ret['photo']); self::updateAvatar($contact_id, $ret['photo']);
@ -2699,7 +2699,7 @@ class Contact
DI::intro()->save($intro); 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) && if (($user['notify-flags'] & Notification\Type::INTRO) &&
in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {

5
src/Model/User.php
View file

@ -481,13 +481,12 @@ class User
/** /**
* Returns the default group for a given user and network * Returns the default group for a given user and network
* *
* @param int $uid User id * @param int $uid User id
* @param string $network network name
* *
* @return int group id * @return int group id
* @throws Exception * @throws Exception
*/ */
public static function getDefaultGroup($uid, $network = '') public static function getDefaultGroup($uid)
{ {
$user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]); $user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
if (DBA::isResult($user)) { if (DBA::isResult($user)) {