aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-30 21:53:51 -0700
committerFriendika <info@friendika.com>2011-04-30 21:53:51 -0700
commit69dc17eb81fb0e0f0a21b4495807aa24cb90fa18 (patch)
treee2c815e9ae85222d3bccbd974e2c0728e94d7e92 /mod
parent0db25abcefd871d5e87f02cbd896f71a7795a8e6 (diff)
downloadvolse-hubzilla-69dc17eb81fb0e0f0a21b4495807aa24cb90fa18.tar.gz
volse-hubzilla-69dc17eb81fb0e0f0a21b4495807aa24cb90fa18.tar.bz2
volse-hubzilla-69dc17eb81fb0e0f0a21b4495807aa24cb90fa18.zip
when viewing network group, show my private conversations to the group
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index ae991e6ee..8846b8086 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -137,7 +137,7 @@ function network_content(&$a, $update = 0) {
notice( t('Group is empty'));
}
- $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
+ $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
}
elseif($cid) {