4.1 Beta...ish #12

Merged
timw4mail merged 88 commits from develop into master 2018-11-05 13:15:59 -05:00
Showing only changes of commit ca6954936f - Show all commits

View File

@ -88,7 +88,9 @@ class UrlGenerator extends RoutingBase {
}
$path = implode('/', $path_segments);
$scheme = (isset($_SERVER['HTTPS'])) ? 'https:' : 'http:';
$isHttps = $_SERVER['SERVER_PORT'] === '443' || isset($_SERVER['HTTPS']);
$scheme = ($isHttps) ? 'https:' : 'http:';
return "{$scheme}//{$this->host}/{$path}";
}