aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Network.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-06-17 07:33:46 +0000
committerMario <mario@mariovavti.com>2021-06-17 07:33:46 +0000
commitfa076efd3bd953863f01bcb474ddb4fc928507e7 (patch)
treed1a6f9e97ac919f91f7658aa16132565deae014a /Zotlabs/Module/Network.php
parent9b71c090c5c8d051e6997c4a39241bbbd5cb6cee (diff)
parentb55676d08914d58927b5503a1bfa283397cd6d44 (diff)
downloadvolse-hubzilla-fa076efd3bd953863f01bcb474ddb4fc928507e7.tar.gz
volse-hubzilla-fa076efd3bd953863f01bcb474ddb4fc928507e7.tar.bz2
volse-hubzilla-fa076efd3bd953863f01bcb474ddb4fc928507e7.zip
Merge branch 'dm' into 'dev'
New landing page HQ with separate views for direct messages, public/limited messages and starred messages if the feature is enabled See merge request hubzilla/core!1969
Diffstat (limited to 'Zotlabs/Module/Network.php')
-rw-r--r--Zotlabs/Module/Network.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index a21095940..be954cbfd 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -388,6 +388,10 @@ class Network extends \Zotlabs\Web\Controller {
if ($dm) {
$sql_extra .= " AND item_private = 2 ";
}
+ else {
+ $sql_extra .= " AND item_private IN (0, 1) ";
+ }
+
if($conv) {
$item_thread_top = '';