diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
| commit | 6decffb00c00fabcb4ef581084eaca038e340686 (patch) | |
| tree | 34471f015e0b33007ad40059dfdd09c83a768fbb /boot.php | |
| parent | 1dc795722a8e748ebb98e8fab778cd4686a0654f (diff) | |
| parent | 6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (diff) | |
| download | volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.gz volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.bz2 volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.3.2' ); +define ( 'STD_VERSION', '3.3.3' ); define ( 'ZOT_REVISION', '6.0a' ); @@ -857,7 +857,7 @@ class App { self::$scheme = 'https'; if(x($_SERVER,'SERVER_NAME')) { - self::$hostname = $_SERVER['SERVER_NAME']; + self::$hostname = punify($_SERVER['SERVER_NAME']); if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) self::$hostname .= ':' . $_SERVER['SERVER_PORT']; @@ -954,14 +954,14 @@ class App { && is_array(self::$config['system']) && array_key_exists('baseurl',self::$config['system']) && strlen(self::$config['system']['baseurl'])) { - $url = self::$config['system']['baseurl']; + $url = punify(self::$config['system']['baseurl']); $url = trim($url,'\\/'); return $url; } $scheme = self::$scheme; - self::$baseurl = $scheme . "://" . self::$hostname . ((isset(self::$path) && strlen(self::$path)) ? '/' . self::$path : '' ); + self::$baseurl = $scheme . "://" . punify(self::$hostname) . ((isset(self::$path) && strlen(self::$path)) ? '/' . self::$path : '' ); return self::$baseurl; } @@ -972,7 +972,7 @@ class App { && is_array(self::$config['system']) && array_key_exists('baseurl',self::$config['system']) && strlen(self::$config['system']['baseurl'])) { - $url = self::$config['system']['baseurl']; + $url = punify(self::$config['system']['baseurl']); $url = trim($url,'\\/'); } @@ -983,7 +983,7 @@ class App { if($parsed !== false) { self::$scheme = $parsed['scheme']; - self::$hostname = $parsed['host']; + self::$hostname = punify($parsed['host']); if(x($parsed,'port')) self::$hostname .= ':' . $parsed['port']; if(x($parsed,'path')) |