clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12796 from annando/fatal 

Fix fatal error because of an invalid url
This commit is contained in:
Philipp 2023-02-14 22:28:01 +01:00 committed by GitHub
parent 453693122d a3cb43805c
commit 40e0ea239a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Model/GServer.php
View File

@ -1060,10 +1060,11 @@ class GServer
Logger::info('Invalid nodeinfo format', ['url' => $url]); Logger::info('Invalid nodeinfo format', ['url' => $url]);
continue; continue;
} }
if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') { if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
$nodeinfo1_url = $link['href']; $nodeinfo1_url = Network::addBasePath($link['href'], $httpResult->getUrl());
} elseif ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0') { } elseif ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0') {
$nodeinfo2_url = $link['href']; $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl());
} }
} }