MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2920 from rabuzarus/1611_fix_remove_baseurl

Browse source 
Bugfix: "remove_baseurl" wasn't work correct if called statically
This commit is contained in:
Michael Vogel 2016-11-16 06:57:28 +01:00 committed by GitHub
commit cffdca2b1a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot.php
View file

@ -1041,7 +1041,7 @@ class App {
/** /**
* @brief Removes the baseurl from an url. This avoids some mixed content problems. * @brief Removes the baseurl from an url. This avoids some mixed content problems.
* *
* @param string $url * @param string $orig_url
* *
* @return string The cleaned url * @return string The cleaned url
*/ */
@ -1049,13 +1049,13 @@ class App {
// Is the function called statically? // Is the function called statically?
if (!is_object($this)) { if (!is_object($this)) {
return(self::$a->remove_baseurl($url)); return(self::$a->remove_baseurl($orig_url));
} }
// Remove the hostname from the url if it is an internal link // Remove the hostname from the url if it is an internal link
$url = normalise_link($orig_url); $nurl = normalise_link($orig_url);
$base = normalise_link($this->get_baseurl()); $base = normalise_link($this->get_baseurl());
$url = str_replace($base."/", "", $url); $url = str_replace($base."/", "", $nurl);
// if it is an external link return the orignal value // if it is an external link return the orignal value
if ($url == normalise_link($orig_url)) { if ($url == normalise_link($orig_url)) {