]> git.mxchange.org Git - friendica.git/commitdiff
Replace proxy function
authorMichael <heluecht@pirati.ca>
Tue, 6 Jul 2021 09:22:41 +0000 (09:22 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 6 Jul 2021 09:22:41 +0000 (09:22 +0000)
src/Content/Text/BBCode.php

index e079931433f178dd53699c06dfac2bbff92e4b92..eb8ddda8d4b1c9790b87f24f156e61127b584022 100644 (file)
@@ -446,15 +446,15 @@ class BBCode
                return $naked_text;
        }
 
-       private static function proxyUrl($image, $simplehtml = self::INTERNAL, $uriid = 0)
+       private static function proxyUrl($image, $simplehtml = self::INTERNAL, $uriid = 0, $size = '')
        {
                // Only send proxied pictures to API and for internal display
                if (!in_array($simplehtml, [self::INTERNAL, self::API])) {
                        return $image;
                } elseif ($uriid) {
-                       return Post\Link::getByLink($uriid, $image);
+                       return Post\Link::getByLink($uriid, $image, $size);
                } else {
-                       return ProxyUtils::proxifyUrl($image);
+                       return ProxyUtils::proxifyUrl($image, $size);
                }
        }
 
@@ -1025,7 +1025,7 @@ class BBCode
                                } elseif ($attributes['avatar'] && $uriid) {
                                        $attributes['avatar'] = Post\Link::getByLink($uriid, $attributes['avatar'], ProxyUtils::SIZE_THUMB);
                                } elseif ($attributes['avatar']) {
-                                       $attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], ProxyUtils::SIZE_THUMB);
+                                       $attributes['avatar'] = self::proxyUrl($attributes['avatar'], self::INTERNAL, $uriid, ProxyUtils::SIZE_THUMB);
                                }
 
                                $content = preg_replace(Strings::autoLinkRegEx(), '<a href="$1">$1</a>', $match[3]);