diff options
| author | MicMee <michael@meer.name> | 2013-01-23 04:55:09 -0800 |
|---|---|---|
| committer | MicMee <michael@meer.name> | 2013-01-23 04:55:09 -0800 |
| commit | 9996d5ee9b7196774cb1d95334507c20f1883428 (patch) | |
| tree | 4c10561076f16d9f18b7b5943bc1930814c6d52c /include/group.php | |
| parent | fca354aa463e84b67fe62e4067905e8f363c0e80 (diff) | |
| parent | 0b18dd15c5377da121f0fb781c0530ca0d328eb9 (diff) | |
| download | volse-hubzilla-9996d5ee9b7196774cb1d95334507c20f1883428.tar.gz volse-hubzilla-9996d5ee9b7196774cb1d95334507c20f1883428.tar.bz2 volse-hubzilla-9996d5ee9b7196774cb1d95334507c20f1883428.zip | |
Merge pull request #1 from friendica/master
get changes
Diffstat (limited to 'include/group.php')
| -rw-r--r-- | include/group.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/group.php b/include/group.php index 6568af0c7..3a2fe7a3c 100644 --- a/include/group.php +++ b/include/group.php @@ -169,7 +169,7 @@ function group_add_member($uid,$name,$member,$gid = 0) { function group_get_members($gid) { $ret = array(); if(intval($gid)) { - $r = q("SELECT abook.*,xchan.*,group_member.* 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 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 ", intval($gid), @@ -228,7 +228,6 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 ); - $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", intval($_SESSION['uid']) ); |