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

Merge pull request #2919 from annando/1611-ssl-plink 

Bugfix: "remove_baseurl" accidentally normalized all links
This commit is contained in:
rabuzarus 2016-11-16 00:33:39 +01:00 committed by GitHub
parent 4eccdd7251 740aaa69f5
commit 7729e6cfb4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
boot.php
View File

@ -1045,16 +1045,24 @@ class App {
* *
* @return string The cleaned url * @return string The cleaned url
*/ */
function remove_baseurl($url){ function remove_baseurl($orig_url){
// 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($url));
}
$url = normalise_link($url); // Remove the hostname from the url if it is an internal link
$url = 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."/", "", $url);
return $url;
// if it is an external link return the orignal value
if ($url == normalise_link($orig_url)) {
return $orig_url;
} else {
return $url;
}
} }
/** /**