diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-02-01 20:29:23 +0100 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-02-01 20:29:23 +0100 |
commit | 27c80af1dd9b871ab44452a8de22fd9cabaa184c (patch) | |
tree | 707c7659c3594895097eb6886f0b235790a69fa3 /system/core/Config.php | |
parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) | |
parent | 5b0b5b92034c1e708f24437c8d2317e1daee535a (diff) |
Merge pull request #1006 from duggan/patch-1
HTTPS detection fix
Diffstat (limited to 'system/core/Config.php')
-rwxr-xr-x | system/core/Config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index 66369115a..68417435d 100755 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -80,7 +80,7 @@ class CI_Config { { if (isset($_SERVER['HTTP_HOST'])) { - $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; + $base_url = ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; $base_url .= '://'. $_SERVER['HTTP_HOST'] . str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']); } |