spelling: incoming

[friendica.git] / src / Content / Conversation.php

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 7cf20762711ab7a13ffa6dcfdd940b7b97e3e172..cdc6e6351f35fbb5b955d7f998f9af60bfc2b73e 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -445,7 +445,6 @@ class Conversation
                $this->page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
                $this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
                $this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
-               $this->page->registerStylesheet(Theme::getPathForFile('vendor/enyo/dropzone/dist/min/dropzone.min.css'));
 
                $live_update_div = '';
 
@@ -986,6 +985,8 @@ class Conversation
                $condition = DBA::mergeConditions($condition,
                        ["`uid` IN (0, ?) AND (NOT `vid` IN (?, ?, ?) OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW), Verb::getID(Activity::VIEW), Verb::getID(Activity::READ)]);
 
+               $condition = DBA::mergeConditions($condition, ["(`uid` != ? OR `private` != ?)", 0, ItemModel::PRIVATE]);
+
                $condition = DBA::mergeConditions($condition,
                        ["`visible` AND NOT `deleted` AND NOT `author-blocked` AND NOT `owner-blocked`
                        AND ((NOT `contact-pending` AND (`contact-rel` IN (?, ?))) OR `self` OR `contact-uid` = ?)",