diff options
| author | friendica <info@friendica.com> | 2011-12-22 15:42:01 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-22 15:42:01 -0800 |
| commit | 95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa (patch) | |
| tree | ced1f9a8bc579f85e0b74f76239de76ea95cedc0 /mod/network.php | |
| parent | ed725df5f1c1ea2484c689283e93f8f825591384 (diff) | |
| parent | b602203e6c9ae4b380fa615450e1a573f47cb756 (diff) | |
| download | volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.tar.gz volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.tar.bz2 volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.zip | |
Merge branch 'master' into notify
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/network.php b/mod/network.php index e9e761c3f..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) { @@ -398,10 +399,9 @@ function network_content(&$a, $update = 0) { $simple_update = (($update) ? " and `item`.`unseen` = 1 " : ''); if($nouveau) { - // "New Item View" - show all items unthreaded in reverse created date order - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` @@ -414,7 +414,7 @@ function network_content(&$a, $update = 0) { ORDER BY `item`.`received` DESC $pager_sql ", intval($_SESSION['uid']) ); - + } else { |