Merge pull request #12562 from MrPetovan/bug/notices

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

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index fc7d369ad528d1b4d89f9e9c76aeb6d5c034dfb6..67a0becb04e842103c7304accb1bb2b36600152b 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,7 @@ namespace Friendica\Util;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * Proxy utilities class
@@ -173,12 +174,15 @@ class Proxy
         */
        private static function parseQuery(string $url): array
        {
-               $query = parse_url($url, PHP_URL_QUERY);
-               $query = html_entity_decode($query);
+               try {
+                       $uri = new Uri($url);
 
-               parse_str($query, $arr);
+                       parse_str($uri->getQuery(), $arr);
 
-               return $arr;
+                       return $arr;
+               } catch (\Throwable $e) {
+                       return [];
+               }
        }
 
        /**