Check the existence of the `uid` field before accessing it in Module\Photo

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

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 12be746a687f1548b30208e9b3dc2872ff199dc6..16f635e3a04b402e1ac8255f8ced3a2a72589db5 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -72,17 +72,20 @@ class Proxy
         * Transform a remote URL into a local one.
         *
         * This function only performs the URL replacement on http URL and if the
-        * provided URL isn't local, "the isn't deactivated" (sic) and if the config
-        * system.proxy_disabled is set to false.
+        * provided URL isn't local
         *
         * @param string $url       The URL to proxyfy
-        * @param string $size      One of the ProxyUtils::SIZE_* constants
+        * @param string $size      One of the Proxy::SIZE_* constants
         *
         * @return string The proxyfied URL or relative path
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function proxifyUrl($url, $size = '')
        {
+               if (!DI::config()->get('system', 'proxify_content')) {
+                       return $url;
+               }
+
                // Trim URL first
                $url = trim($url);
 
@@ -91,11 +94,6 @@ class Proxy
                        return $url;
                }
 
-               // Is the proxy disabled?
-               if (DI::config()->get('system', 'proxy_disabled')) {
-                       return $url;
-               }
-
                // Image URL may have encoded ampersands for display which aren't desirable for proxy
                $url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');