mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:35:12 +00:00
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
This commit is contained in:
commit
cadef5924f
1 changed files with 4 additions and 1 deletions
5
boot.php
5
boot.php
|
@ -954,7 +954,10 @@ class App {
|
||||||
&& is_array(self::$config['system'])
|
&& is_array(self::$config['system'])
|
||||||
&& array_key_exists('baseurl',self::$config['system'])
|
&& array_key_exists('baseurl',self::$config['system'])
|
||||||
&& strlen(self::$config['system']['baseurl'])) {
|
&& strlen(self::$config['system']['baseurl'])) {
|
||||||
$url = punify(self::$config['system']['baseurl']);
|
// get_baseurl() is a heavily used function.
|
||||||
|
// Do not use punify() here until we find a library that performs better than what we have now.
|
||||||
|
//$url = punify(self::$config['system']['baseurl']);
|
||||||
|
$url = self::$config['system']['baseurl'];
|
||||||
$url = trim($url,'\\/');
|
$url = trim($url,'\\/');
|
||||||
return $url;
|
return $url;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue