Merge pull request #8978 from annando/contact-update

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 8507c5ba977919407f46ff50004f373154959b15..86af3b69d496902c71aab1c4a6c414056c1a9ded 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -40,7 +40,6 @@ use Friendica\Object\Thread;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
@@ -316,7 +315,7 @@ function conv_get_blocklist()
                return [];
        }
 
-       $str_blocked = DI::pConfig()->get(local_user(), 'system', 'blocked');
+       $str_blocked = str_replace(["\n", "\r"], ",", DI::pConfig()->get(local_user(), 'system', 'blocked'));
        if (empty($str_blocked)) {
                return [];
        }
@@ -593,7 +592,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'name' => $profile_name,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
-                                       'thumb' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
+                                       'thumb' => DI::baseUrl()->remove($item['author-avatar']),
                                        'title' => $title,
                                        'body' => $body,
                                        'tags' => $tags['tags'],
@@ -613,7 +612,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'indent' => '',
                                        'owner_name' => $owner_name,
                                        'owner_url' => $owner_url,
-                                       'owner_photo' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
+                                       'owner_photo' => DI::baseUrl()->remove($item['owner-avatar']),
                                        'plink' => Item::getPlink($item),
                                        'edpost' => false,
                                        'isstarred' => $isstarred,