bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #987 from annando/master

Browse source 
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
This commit is contained in:
Tobias Diekershoff 2014-05-25 07:59:22 +02:00
commit 97e74f1570
8 changed files with 87 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/network.php
View file

@ -710,7 +710,7 @@ die("ss");
);
} else {
$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
AND `thread`.`moderated` = 0