Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

[friendica.git] / src / Util / Proxy.php

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 443725a3d88f334c5ebe440ac60de0efb5db7d12..27480900008859cfb612e54ac8d7f62717285a5f 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -82,6 +82,10 @@ class Proxy
         */
        public static function proxifyUrl($url, $size = '')
        {
+               if (!DI::config()->get('system', 'proxify_content')) {
+                       return $url;
+               }
+
                // Trim URL first
                $url = trim($url);