GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'group-members-pending' into 'nightly' 

Fix "pending members" group list

Related to #104 

See merge request !64
This commit is contained in:
mmn 2015-12-14 20:47:47 +00:00
parent 5f0412b9ee a06dc57621
commit d5d8068632
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
classes/User_group.php
View File

@ -220,24 +220,19 @@ class User_group extends Managed_DataObject
*/
function getRequests($offset=0, $limit=null)
{
$qry =
'SELECT profile.* ' .
'FROM profile JOIN group_join_queue '.
'ON profile.id = group_join_queue.profile_id ' .
'WHERE group_join_queue.group_id = %d ' .
'ORDER BY group_join_queue.created DESC ';
if ($limit != null) {
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
}
$rq = new Group_join_queue();
$rq->group_id = $this->id;
$members = new Profile();
$members->query(sprintf($qry, $this->id));
$members->joinAdd(['id', $rq, 'profile_id']);
if ($limit != null) {
$members->limit($offset, $limit);
}
$members->find();
return $members;
}