aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-22 20:13:20 -0800
committerfriendica <info@friendica.com>2013-01-22 20:13:20 -0800
commitd43591fb0f5c552b1c725dc2cbaeaea8fe441319 (patch)
tree0111d8cc29b3e2af07501c65b025e66f0b2a37cc /include
parentc09fad42ea997ad3e1b669f7ddcf07cccb7078d1 (diff)
downloadvolse-hubzilla-d43591fb0f5c552b1c725dc2cbaeaea8fe441319.tar.gz
volse-hubzilla-d43591fb0f5c552b1c725dc2cbaeaea8fe441319.tar.bz2
volse-hubzilla-d43591fb0f5c552b1c725dc2cbaeaea8fe441319.zip
fixed contactgroup editor
Diffstat (limited to 'include')
-rw-r--r--include/group.php3
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'])
);