X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=7e76df87e36c0b2fed34f19e39ea5b31a257fdee;hb=b1999459afe1f955e7373f4b4894b44324b10e1e;hp=88f7ad7829fff1e30d40290b2794d2834fd089a1;hpb=85875fc07f9a859d0796adc48bc124c489a486dc;p=friendica.git diff --git a/boot.php b/boot.php index 88f7ad7829..7e76df87e3 100644 --- a/boot.php +++ b/boot.php @@ -1041,20 +1041,28 @@ class App { /** * @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 */ - function remove_baseurl($url){ + function remove_baseurl($orig_url){ // Is the function called statically? - if (!is_object($this)) - return(self::$a->remove_baseurl($url)); + if (!is_object($this)) { + return(self::$a->remove_baseurl($orig_url)); + } - $url = normalise_link($url); + // Remove the hostname from the url if it is an internal link + $nurl = normalise_link($orig_url); $base = normalise_link($this->get_baseurl()); - $url = str_replace($base."/", "", $url); - return $url; + $url = str_replace($base."/", "", $nurl); + + // if it is an external link return the orignal value + if ($url == normalise_link($orig_url)) { + return $orig_url; + } else { + return $url; + } } /**