diff options
| author | friendica <info@friendica.com> | 2015-03-13 19:24:17 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-13 19:24:17 -0700 |
| commit | b76cdf82d298c92bdf5a59b6bf6b55da504a46ea (patch) | |
| tree | a6837fc53dc2e523f0a4c5f41a3782b093f3453d /mod/network.php | |
| parent | 27e92ff2773cd12306bd2ce235d7fbea8f0e1bd4 (diff) | |
| download | volse-hubzilla-b76cdf82d298c92bdf5a59b6bf6b55da504a46ea.tar.gz volse-hubzilla-b76cdf82d298c92bdf5a59b6bf6b55da504a46ea.tar.bz2 volse-hubzilla-b76cdf82d298c92bdf5a59b6bf6b55da504a46ea.zip | |
create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mod/network.php b/mod/network.php index 642fc4f43..d2b9bc64c 100644 --- a/mod/network.php +++ b/mod/network.php @@ -377,8 +377,8 @@ function network_content(&$a, $update = 0, $load = false) { // "New Item View" - show all items unthreaded in reverse created date order $items = q("SELECT item.*, item.id AS item_id, received FROM item - left join abook on item.owner_xchan = abook.abook_xchan - WHERE true $uids $abook_uids AND item_restrict = 0 + left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) + WHERE true $uids AND item_restrict = 0 and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $simple_update $sql_extra $sql_nets @@ -408,8 +408,8 @@ function network_content(&$a, $update = 0, $load = false) { // Fetch a page full of parent items for this page $r = q("SELECT distinct item.id AS item_id, $ordering FROM item - left join abook on item.owner_xchan = abook.abook_xchan - WHERE true $uids $abook_uids AND item.item_restrict = 0 + left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) + WHERE true $uids AND item.item_restrict = 0 AND item.parent = item.id and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets @@ -422,8 +422,8 @@ function network_content(&$a, $update = 0, $load = false) { if(! $firehose) { // update $r = q("SELECT item.parent AS item_id FROM item - left join abook on item.owner_xchan = abook.abook_xchan - WHERE true $uids $abook_uids AND item.item_restrict = 0 $simple_update + left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) + WHERE true $uids AND item.item_restrict = 0 $simple_update and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets ", intval(ABOOK_FLAG_BLOCKED) |