bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Just some more removed baseurls ...

Browse source
This commit is contained in:
Michael Vogel 2016-02-17 08:08:28 +01:00
commit c5b724828a
11 changed files with 46 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
boot.php
View file

@ -920,10 +920,6 @@ class App {
}
function get_cached_avatar_image($avatar_image){
// Just remove the base url. This avoid mixed content
$avatar_image = normalise_link($avatar_image);
$base = normalise_link($this->get_baseurl());
$avatar_image = str_replace($base."/", "", $avatar_image);
return $avatar_image;
// The following code is deactivated. It doesn't seem to make any sense and it slows down the system.
@ -951,6 +947,25 @@ class App {
}
/**
* @brief Removes the baseurl from an url. This avoids some mixed content problems.
*
* @param string $url
*
* @return string The cleaned url
*/
function remove_baseurl($url){
// Is the function called statically?
if (!is_object($this))
return(self::$a->remove_baseurl($ssl));
$url = normalise_link($url);
$base = normalise_link($this->get_baseurl());
$url = str_replace($base."/", "", $url);
return $url;
}
/**
* @brief Register template engine class
*