keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert sql optimisation - js updates broken

Browse source
This commit is contained in:
friendica 2012-01-02 00:20:06 -08:00
parent fb3a0baa78
commit a5144518aa
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/network.php
View file

@ -276,9 +276,7 @@ function network_content(&$a, $update = 0) {
if($bmark) if($bmark)
$star_sql .= " AND `bookmark` = 1 "; $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 ) ";
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql $update_sql ) ";
if($group) { if($group) {
$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", $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')); 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; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
} }
elseif($cid) { elseif($cid) {
@ -312,7 +310,7 @@ function network_content(&$a, $update = 0) {
intval($cid) intval($cid)
); );
if(count($r)) { 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; $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'))) { 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); 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` $r = q("SELECT distinct(`parent`) AS `item_id`, `contact`.`uid` AS `contact_uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 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 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra ", $sql_extra ",
intval(local_user()) intval(local_user())