From 56d64316f457c85141e35356a61a4d352ed9f24c Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 23 Aug 2011 18:17:35 -0700 Subject: diaspora photos ? --- include/group.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/group.php') diff --git a/include/group.php b/include/group.php index 1ebae7b7b..5e3a1511a 100644 --- a/include/group.php +++ b/include/group.php @@ -124,9 +124,10 @@ function group_public_members($gid) { $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d - AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' AND `contact`.`network` != 'face' ", + AND `contact`.`network` = '%' AND `contact`.`notify` != '' ", intval($gid), - intval(local_user()) + intval(local_user()), + dbesc(NETWORK_OSTATUS) ); if(count($r)) $ret = count($r); -- cgit v1.2.3 From b41592f5563f0cf1e776a02da6771cd096d47943 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 23 Aug 2011 18:22:15 -0700 Subject: fix group public members --- include/group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/group.php') diff --git a/include/group.php b/include/group.php index 5e3a1511a..d69679484 100644 --- a/include/group.php +++ b/include/group.php @@ -124,7 +124,7 @@ function group_public_members($gid) { $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d - AND `contact`.`network` = '%' AND `contact`.`notify` != '' ", + AND ( `contact`.`network` = '%s' OR `contact`.`notify` != '' )", intval($gid), intval(local_user()), dbesc(NETWORK_OSTATUS) -- cgit v1.2.3 From 3b4da00495f17fd937ebdfc14b52106ac4d9a5f3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 23 Aug 2011 18:28:17 -0700 Subject: fix it again --- include/group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/group.php') diff --git a/include/group.php b/include/group.php index d69679484..f21ce42e0 100644 --- a/include/group.php +++ b/include/group.php @@ -124,7 +124,7 @@ function group_public_members($gid) { $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d - AND ( `contact`.`network` = '%s' OR `contact`.`notify` != '' )", + AND ( `contact`.`network` = '%s' OR `contact`.`notify` = '' )", intval($gid), intval(local_user()), dbesc(NETWORK_OSTATUS) -- cgit v1.2.3