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

Issue 8866: Fix fetching feed links with missing base

Browse Source
This commit is contained in:
Michael
2020-07-12 12:45:34 +00:00
parent 09bb0dff42
commit 81928727f2
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Util/Network.php
View File

@@ -625,6 +625,26 @@ class Network
return $url;
}
/**
* Add a missing base path (scheme and host) to a given url
*
* @param string $url
* @param string $basepath
* @return string url
*/
public static function addBasePath(string $url, string $basepath)
{
if (!empty(parse_url($url, PHP_URL_SCHEME)) || empty(parse_url($basepath, PHP_URL_SCHEME)) || empty($url) || empty(parse_url($url))) {
return $url;
}
$base = ['scheme' => parse_url($basepath, PHP_URL_SCHEME),
'host' => parse_url($basepath, PHP_URL_HOST)];
$parts = array_merge($base, parse_url('/' . ltrim($url, '/')));
return self::unparseURL($parts);
}
/**
* Returns the original URL of the provided URL
*