Update Event.php

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

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 46a906b13829ca1448e1e2d6736b7ad67579be6a..6d19eb16356ce450d22f7ee4714a167285b948c8 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -526,7 +526,7 @@ class Conversation
                        $live_update_div = '<div id="live-search"></div>' . "\r\n";
                }
 
-               $page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid;
+               $page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid && $mode != 'search';
 
                if (!$update) {
                        $_SESSION['return_path'] = $this->args->getQueryString();
@@ -794,10 +794,7 @@ class Conversation
                        return [];
                }
 
-               $blocked = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked');
-               if (!empty($blocked)) {
-                       $str_blocked = str_replace(["\n", "\r"], ",", $blocked);
-               }
+               $str_blocked = str_replace(["\n", "\r"], ",", $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked') ?? '');
                if (empty($str_blocked)) {
                        return [];
                }