harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

members_of_group() output not entirely correct

Browse Source
This commit is contained in:
friendica 2013-05-02 20:51:58 -07:00
parent 9f36fd107f
commit b33c15d045
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/group.php
View File

@ -187,9 +187,10 @@ function group_get_members($gid) {
if(intval($gid)) { if(intval($gid)) {
$r = q("SELECT * FROM `group_member` $r = q("SELECT * FROM `group_member`
LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
WHERE `gid` = %d AND `group_member`.`uid` = %d and not ( abook_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ", WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( abook_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ",
intval($gid), intval($gid),
intval(local_user()), intval(local_user()),
intval(local_user()),
intval(ABOOK_FLAG_SELF), intval(ABOOK_FLAG_SELF),
intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_BLOCKED),
intval(ABOOK_FLAG_PENDING) intval(ABOOK_FLAG_PENDING)

4
mod/group.php
View File

@ -143,12 +143,14 @@ function group_content(&$a) {
} }
$group = $r[0]; $group = $r[0];
$members = group_get_members($group['id']); $members = group_get_members($group['id']);
$preselected = array(); $preselected = array();
if(count($members)) { if(count($members)) {
foreach($members as $member) foreach($members as $member)
$preselected[] = $member['xchan_hash']; if(! in_array($member['xchan_hash'],$preselected))
$preselected[] = $member['xchan_hash'];
} }
if($change) { if($change) {