diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:54:00 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:54:00 +0100 |
| commit | 2d002723f9a9677d613a91df953d7dcf9f4361e7 (patch) | |
| tree | df3428dbd3bde5597f4f187116bcc4356743b304 /system/core | |
| parent | b76029d8be1f2d98f1668d61e7f7ac3d9274b8f3 (diff) | |
| parent | 27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-db-odbc
Diffstat (limited to 'system/core')
| -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']); } |