diff options
| author | friendica <info@friendica.com> | 2012-01-02 00:20:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-02 00:20:06 -0800 |
| commit | a5144518aa0a3ce8440358dcce5d7c5a9fb5797d (patch) | |
| tree | 7df75fd8078e51cc14cb7bc8a892f7909775435a | |
| parent | fb3a0baa786926b12b35525cb2a08c3dedb58e18 (diff) | |
| download | volse-hubzilla-a5144518aa0a3ce8440358dcce5d7c5a9fb5797d.tar.gz volse-hubzilla-a5144518aa0a3ce8440358dcce5d7c5a9fb5797d.tar.bz2 volse-hubzilla-a5144518aa0a3ce8440358dcce5d7c5a9fb5797d.zip | |
revert sql optimisation - js updates broken
| -rw-r--r-- | mod/network.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mod/network.php b/mod/network.php index a8f4f72ec..8f65475db 100644 --- a/mod/network.php +++ b/mod/network.php @@ -276,9 +276,7 @@ function network_content(&$a, $update = 0) { if($bmark) $star_sql .= " AND `bookmark` = 1 "; - $update_sql = ((($update) && (! $nouveau)) ? " and unseen = 1 " : ''); - - $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql $update_sql ) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql ) "; if($group) { $r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -302,7 +300,7 @@ function network_content(&$a, $update = 0) { info( t('Group is empty')); } - $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql $update_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) { @@ -312,7 +310,7 @@ function network_content(&$a, $update = 0) { intval($cid) ); if(count($r)) { - $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql $update_sql AND `contact-id` = " . intval($cid) . " ) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql AND `contact-id` = " . intval($cid) . " ) "; $o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o; if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { notice( t('Private messages to this person are at risk of public disclosure.') . EOL); @@ -432,6 +430,7 @@ function network_content(&$a, $update = 0) { $r = q("SELECT distinct(`parent`) AS `item_id`, `contact`.`uid` AS `contact_uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + and `item`.`parent` in ( select parent from item where unseen = 1 ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra ", intval(local_user()) |