diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-08-26 14:44:24 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-08-26 14:44:24 +0200 |
| commit | 5ec4a4e6deb5d28cbfab54093f8b4180912738d4 (patch) | |
| tree | 653cb4738734d9f20bd1457c419105dcf235edea /include/group.php | |
| parent | 97806544bcd7ee3831ffc515062afe0812828b76 (diff) | |
| parent | 1861dc1fae549a0ee2b6287d4f7dc7f8797f5070 (diff) | |
| download | volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.tar.gz volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.tar.bz2 volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/group.php')
| -rw-r--r-- | include/group.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/group.php b/include/group.php index 1ebae7b7b..f21ce42e0 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` = '%s' OR `contact`.`notify` = '' )", intval($gid), - intval(local_user()) + intval(local_user()), + dbesc(NETWORK_OSTATUS) ); if(count($r)) $ret = count($r); |