diff options
| author | mrjive <mrjive@mrjive.it> | 2018-03-29 17:47:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 17:47:50 +0200 |
| commit | 20ac91703d54679d2e5080ba2d4985e93986a515 (patch) | |
| tree | dca933ae97c7eeaf855d8522163e989317ce918f /boot.php | |
| parent | c98776923a3aed4a0a17ca1412787de3b718eba9 (diff) | |
| parent | e06e64823fbecbe67bcf59897ecad6b9c402744e (diff) | |
| download | volse-hubzilla-20ac91703d54679d2e5080ba2d4985e93986a515.tar.gz volse-hubzilla-20ac91703d54679d2e5080ba2d4985e93986a515.tar.bz2 volse-hubzilla-20ac91703d54679d2e5080ba2d4985e93986a515.zip | |
Merge pull request #1 from redmatrix/dev
Dev
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')) |