diff options
| author | friendica <info@friendica.com> | 2013-01-12 19:05:14 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-12 19:05:14 -0800 |
| commit | 434c9ae47afc4527ff58180126b5b6c43730fc50 (patch) | |
| tree | 45dd7b493b8a4b6d078beef48d617b5c28150268 /mod/network.php | |
| parent | 4f6c4f4d2db495c03fca6339557e6f5165343b74 (diff) | |
| download | volse-hubzilla-434c9ae47afc4527ff58180126b5b6c43730fc50.tar.gz volse-hubzilla-434c9ae47afc4527ff58180126b5b6c43730fc50.tar.bz2 volse-hubzilla-434c9ae47afc4527ff58180126b5b6c43730fc50.zip | |
rewrite the conv search
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 49121dd52..143b7c5d1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -545,10 +545,9 @@ function network_content(&$a, $update = 0, $load = false) { } 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'])), - intval(TERM_MENTION), - dbesc(protect_sprintf($channel['channel_address'])) + intval(ITEM_MENTIONSME) ); } @@ -621,7 +620,7 @@ function network_content(&$a, $update = 0, $load = false) { if($load) { // Fetch a page full of parent items for this page - +dbg(1); $r = q("SELECT item.id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan 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(ABOOK_FLAG_BLOCKED) ); +dbg(0); } else { // update |