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

Merge pull request #12264 from annando/error 

Fix "Argument #1 ($parts) must be of type array, bool given"
This commit is contained in:
Hypolite Petovan 2022-11-25 08:05:10 -05:00 committed by GitHub
parent 7c7cb8373c fa5e7585a3
commit 01558d6dda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/GServer.php
View File

@ -115,12 +115,12 @@ class GServer
*/ */
public static function getID(string $url, bool $no_check = false): ?int public static function getID(string $url, bool $no_check = false): ?int
{ {
$url = self::cleanURL($url);
if (empty($url)) { if (empty($url)) {
return null; return null;
} }
$url = self::cleanURL($url);
$gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]); $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]);
if (DBA::isResult($gserver)) { if (DBA::isResult($gserver)) {
Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url, 'callstack' => System::callstack(20)]); Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url, 'callstack' => System::callstack(20)]);
@ -323,6 +323,10 @@ class GServer
$url = str_replace('/index.php', '', $url); $url = str_replace('/index.php', '', $url);
$urlparts = parse_url($url); $urlparts = parse_url($url);
if (empty($urlparts)) {
return '';
}
unset($urlparts['user']); unset($urlparts['user']);
unset($urlparts['pass']); unset($urlparts['pass']);
unset($urlparts['query']); unset($urlparts['query']);