Merge pull request #8102 from annando/servertest

[friendica.git] / src / Content / Text / BBCode.php

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 46eb95bd308d2f9e13c78a6fec41ea2125fc08de..19ff88a9cb04a7ffb31ea6bd9ee4c80569617b4e 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -10,7 +10,6 @@ use DOMXPath;
 use Exception;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Smilies;
-use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -967,9 +966,6 @@ class BBCode
                                $attributes['avatar']   = ($author_contact['micro'] ?? '') ?: $attributes['avatar'];
                                $attributes['profile']  = ($author_contact['url']   ?? '') ?: $attributes['profile'];
 
-                               // $author_contact['url'] could be empty. So then we fill it with the profile
-                               $author_contact['url']  = ($attributes['profile']   ?? '') ?: $author_contact['url'];
-
                                if ($attributes['avatar']) {
                                        $attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], false, ProxyUtils::SIZE_THUMB);
                                }
@@ -1073,7 +1069,7 @@ class BBCode
        private static function removePictureLinksCallback($match)
        {
                $cache_key = 'remove:' . $match[1];
-               $text = Cache::get($cache_key);
+               $text = DI::cache()->get($cache_key);
 
                if (is_null($text)) {
                        $a = DI::app();
@@ -1115,7 +1111,7 @@ class BBCode
                                        }
                                }
                        }
-                       Cache::set($cache_key, $text);
+                       DI::cache()->set($cache_key, $text);
                }
 
                return $text;
@@ -1146,7 +1142,7 @@ class BBCode
                }
 
                $cache_key = 'clean:' . $match[1];
-               $text = Cache::get($cache_key);
+               $text = DI::cache()->get($cache_key);
                if (!is_null($text)) {
                        return $text;
                }
@@ -1197,7 +1193,7 @@ class BBCode
                                }
                        }
                }
-               Cache::set($cache_key, $text);
+               DI::cache()->set($cache_key, $text);
 
                return $text;
        }