diff options
| author | Mario <mario@mariovavti.com> | 2025-03-27 10:31:07 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2025-03-27 10:31:07 +0000 |
| commit | a46d837267aff8116f59bf7caeed83e377eac0a0 (patch) | |
| tree | 3627d970548a84e16830bd085c09b8ce7a29ad62 /Zotlabs | |
| parent | bee493f628bfbf60e7ab184de5a4cf1269ee462e (diff) | |
| download | volse-hubzilla-a46d837267aff8116f59bf7caeed83e377eac0a0.tar.gz volse-hubzilla-a46d837267aff8116f59bf7caeed83e377eac0a0.tar.bz2 volse-hubzilla-a46d837267aff8116f59bf7caeed83e377eac0a0.zip | |
minor cleanup
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Network.php | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 3ea813547..0b1a90f08 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -278,19 +278,8 @@ class Network extends \Zotlabs\Web\Controller { $likes_sql = " AND verb NOT IN ('Like', 'Dislike', '" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; // This is for nouveau view public forum cid queries (if a forum notification is clicked) - //$p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", - //intval(local_channel()), - //intval(TERM_FORUM), - //dbesc($cid_r[0]['xchan_name']) - //); - //$p_str = ids_to_querystr($p, 'parent'); - - $p_sql = ''; - //if($p_str) - //$p_sql = " OR item.parent IN ( $p_str ) "; - - $sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 $likes_sql "; + $sql_extra = " AND owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' AND item_unseen = 1 $likes_sql "; } else { // This is for threaded view cid queries (e.g. if a forum is selected from the forum filter) @@ -472,7 +461,7 @@ class Network extends \Zotlabs\Web\Controller { if($nouveau && $load) { // "New Item View" - show all items unthreaded in reverse created date order - $items = dbq("SELECT item.*, item.id AS item_id, created FROM item + $items = dbq("SELECT item.*, item.id AS item_id FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_normal |