keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9727 from annando/notice

Browse source 
Fix a notice when the path is empty
This commit is contained in:
Hypolite Petovan 2020-12-31 07:15:12 -05:00 committed by GitHub
commit 422de110e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Network/Probe.php
View file

@ -1801,6 +1801,7 @@ class Probe
$hrefParts = parse_url($href); $hrefParts = parse_url($href);
if (!empty($hrefParts['path'])) {
// Root path case (/path) including relative scheme case (//host/path) // Root path case (/path) including relative scheme case (//host/path)
if ($hrefParts['path'] && $hrefParts['path'][0] == '/') { if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
$path = $hrefParts['path']; $path = $hrefParts['path'];
@ -1822,6 +1823,7 @@ class Probe
$path = '/' . implode('/', $absolutes); $path = '/' . implode('/', $absolutes);
} }
}
// Relative scheme case (//host/path) // Relative scheme case (//host/path)
$baseParts['host'] = $hrefParts['host'] ?? $baseParts['host']; $baseParts['host'] = $hrefParts['host'] ?? $baseParts['host'];