Make sure base_url always ends with / (#11949)

This commit is contained in:
Tony Murray
2020-07-21 07:27:21 -05:00
committed by GitHub
parent 5a45060e57
commit a4c5502066

View File

@@ -408,10 +408,7 @@ class Config
self::set('base_url', preg_replace('/^http:/', 'https:', self::get('base_url')));
}
// If we're on SSL, let's properly detect it
if (isset($_SERVER['HTTPS'])) {
self::set('base_url', preg_replace('/^http:/', 'https:', self::get('base_url')));
}
self::set('base_url', Str::finish('/', self::get('base_url')));
if (!self::get('email_from')) {
self::set('email_from', '"' . self::get('project_name') . '" <' . self::get('email_user') . '@' . php_uname('n') . '>');