diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-15 10:15:49 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-15 10:15:49 +0200 |
| commit | a422063c7d83c2980dba280efaf1ca271e1939d2 (patch) | |
| tree | 4e55de3c06d62386be1ea44f8ff51f1e91ddecfc /Zotlabs/Module/Network.php | |
| parent | f16dc7afc8c7a866138511465a4d3362b704c33c (diff) | |
| download | volse-hubzilla-a422063c7d83c2980dba280efaf1ca271e1939d2.tar.gz volse-hubzilla-a422063c7d83c2980dba280efaf1ca271e1939d2.tar.bz2 volse-hubzilla-a422063c7d83c2980dba280efaf1ca271e1939d2.zip | |
fix regression where in the starred tab only top level posts were visible
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 6e961dc36..5d4239896 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -213,7 +213,7 @@ class Network extends \Zotlabs\Web\Controller { $distinct = ''; $item_thread_top = ' AND item_thread_top = 1 '; - $sql_extra = $sql_options; + $sql_extra = ''; if($group) { $contact_str = ''; @@ -464,7 +464,7 @@ class Network extends \Zotlabs\Web\Controller { WHERE true $uids $item_normal and (abook.abook_blocked = 0 or abook.abook_flags is null) $simple_update - $sql_extra $sql_nets + $sql_extra $sql_options $sql_nets $net_query2 ORDER BY item.received DESC $pager_sql " ); @@ -493,7 +493,7 @@ class Network extends \Zotlabs\Web\Controller { WHERE true $uids $item_thread_top $item_normal AND item.mid = item.parent_mid and (abook.abook_blocked = 0 or abook.abook_flags is null) - $sql_extra3 $sql_extra $sql_nets + $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2 ORDER BY $ordering DESC $pager_sql " ); @@ -506,7 +506,7 @@ class Network extends \Zotlabs\Web\Controller { $net_query WHERE true $uids $item_normal_update $simple_update and (abook.abook_blocked = 0 or abook.abook_flags is null) - $sql_extra3 $sql_extra $sql_nets $net_query2" + $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2" ); $_SESSION['loadtime'] = datetime_convert(); } |