Merge pull request #11392 from annando/new-acitivities

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

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 48265ce5138ebdb9b2d8bd353a6503888527a2af..0c3a6c988d30ddcc7e520095e35ffbcd63a27a41 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -631,10 +631,12 @@ class Conversation
 
                                        [$categories, $folders] = $this->item->determineCategoriesTerms($item, local_user());
 
-                                       if (!empty($item['content-warning']) && $this->pConfig->get(local_user(), 'system', 'disable_cw', false)) {
+                                       if (!empty($item['title'])) {
+                                               $title = $item['title'];
+                                       } elseif (!empty($item['content-warning']) && $this->pConfig->get(local_user(), 'system', 'disable_cw', false)) {
                                                $title = ucfirst($item['content-warning']);
                                        } else {
-                                               $title = $item['title'];
+                                               $title = '';
                                        }
 
                                        $tmp_item = [