harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite the conv search

Browse Source
This commit is contained in:
friendica 2013-01-12 19:05:14 -08:00
parent 4f6c4f4d2d
commit 434c9ae47a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/network.php
View File

@ -545,10 +545,9 @@ function network_content(&$a, $update = 0, $load = false) {
} }
if($conv) { if($conv) {
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( author_xchan like '%s' or `item`.`id` in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = `item`.`uid`))) ", $sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or ( item_flags & %d ))) ",
dbesc(protect_sprintf($channel['channel_hash'])), dbesc(protect_sprintf($channel['channel_hash'])),
intval(TERM_MENTION), intval(ITEM_MENTIONSME)
dbesc(protect_sprintf($channel['channel_address']))
); );
} }
@ -621,7 +620,7 @@ function network_content(&$a, $update = 0, $load = false) {
if($load) { if($load) {
// Fetch a page full of parent items for this page // Fetch a page full of parent items for this page
dbg(1);
$r = q("SELECT item.id AS item_id FROM item $r = q("SELECT item.id AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan left join abook on item.author_xchan = abook.abook_xchan
WHERE item.uid = %d AND item.item_restrict = 0 WHERE item.uid = %d AND item.item_restrict = 0
@ -632,6 +631,7 @@ function network_content(&$a, $update = 0, $load = false) {
intval(local_user()), intval(local_user()),
intval(ABOOK_FLAG_BLOCKED) intval(ABOOK_FLAG_BLOCKED)
); );
dbg(0);
} }
else { else {
// update // update