keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4081 from MrPetovan/bug/4075-remove-group_member-uid

Browse source 
Remove lingering reference to group_member.uid
This commit is contained in:
Michael Vogel 2017-12-16 18:41:32 +01:00 committed by GitHub
commit 64e61832cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Model/Group.php
View file

@ -57,15 +57,12 @@ class Group extends BaseObject
/** /**
* @brief Get a list of group ids a contact belongs to * @brief Get a list of group ids a contact belongs to
* *
* @todo Get rid of $uid, the contact id already bears the information
*
* @param int $uid
* @param int $cid * @param int $cid
* @return array * @return array
*/ */
private static function getByContactIdForUserId($uid, $cid) private static function getIdsByContactId($cid)
{ {
$condition = ['uid' => $uid, 'contact-id' => $cid]; $condition = ['contact-id' => $cid];
$stmt = dba::select('group_member', ['gid'], $condition); $stmt = dba::select('group_member', ['gid'], $condition);
$return = []; $return = [];
@ -369,7 +366,7 @@ class Group extends BaseObject
$member_of = array(); $member_of = array();
if ($cid) { if ($cid) {
$member_of = self::getByContactIdForUserId(local_user(), $cid); $member_of = self::getIdsByContactId($cid);
} }
while ($group = dba::fetch($stmt)) { while ($group = dba::fetch($stmt)) {