From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 23 Apr 2023 13:12:51 +0000 (+0200)
Subject: Merge branch '2023.03-rc' into stable
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4eec2804de78a6aeb30f843b3b295a563f78a3fe;p=friendica.git

Merge branch '2023.03-rc' into stable
---

4eec2804de78a6aeb30f843b3b295a563f78a3fe
diff --cc src/Worker/UpdateGServer.php
index a17fca81c4,4b4e40d766..a9f6ae4cd3
--- a/src/Worker/UpdateGServer.php
+++ b/src/Worker/UpdateGServer.php
@@@ -53,13 -59,8 +59,13 @@@ class UpdateGServe
  			return;
  		}
  
 +		// Silently dropping the worker task if the server domain is blocked
 +		if (Network::isUrlBlocked($filtered)) {
 +			return;
 +		}
 +
  		if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
- 			GServer::setFailure($server_url);
+ 			GServer::setFailureByUrl($server_url);
  			return;
  		}