aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-12-21 17:37:35 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-12-21 17:37:35 +0100
commit7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b (patch)
treeda414eee593cde8cdf631b598671daac22687380 /mod/network.php
parentbf00e4dded7dd90443eafb8fc1c15b82ce723867 (diff)
parent048fcae40b260b04e7b2e1774c1c72b69f790212 (diff)
downloadvolse-hubzilla-7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b.tar.gz
volse-hubzilla-7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b.tar.bz2
volse-hubzilla-7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'mod/network.php')
-rw-r--r--mod/network.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index 8fa0b03e2..57e120e86 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -301,7 +301,8 @@ function network_content(&$a, $update = 0) {
}
- $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+// $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+ $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
}
elseif($cid) {