X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=91d894d2ee9ede193683747adaad0196f34a98a8;hb=977248f5105a2b3f127d0aa752ce27214605fbf0;hp=465bbeff76aff4d19a8da4a76a7bc2995e484850;hpb=0a4119adaf6294bf43d135a0f435c1dd677c50e0;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 465bbeff76..91d894d2ee 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -12,7 +12,6 @@ namespace Friendica\Network; use DOMDocument; use DomXPath; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; @@ -109,7 +108,7 @@ class Probe $ssl_url = "https://".$host."/.well-known/host-meta"; $url = "http://".$host."/.well-known/host-meta"; - $xrd_timeout = Config::get('system', 'xrd_timeout', 20); + $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); Logger::log("Probing for ".$host, Logger::DEBUG); $xrd = null; @@ -834,9 +833,6 @@ class Probe if (!empty($profile['country'])) { $loc['country-name'] = $profile['country']; } - if (!empty($profile['hometown'])) { - $loc['locality'] = $profile['hometown']; - } $location = Profile::formatLocation($loc); if (!empty($location)) { $data['location'] = $location; @@ -859,7 +855,7 @@ class Probe */ private static function webfinger($url, $type) { - $xrd_timeout = Config::get('system', 'xrd_timeout', 20); + $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); $curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]); if ($curlResult->isTimeout()) {