diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-22 15:56:51 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-22 15:56:51 +0200 |
| commit | 273cc47ae496f74a482ab47b305537a3fa1925f7 (patch) | |
| tree | 86843e04095b6e210ee6837fcf23f5d551ee3932 /system/core/Config.php | |
| parent | f83c4363b5459d294255e3817a230258861ec79b (diff) | |
| parent | 3fb026713013b60845c4cfe633a8a59a30b9c7dd (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_qb_aliasing
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | 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 8e4f998ef..e78128c76 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -75,7 +75,7 @@ class CI_Config { { if (isset($_SERVER['HTTP_HOST'])) { - $base_url = ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') ? 'https' : 'http'; + $base_url = is_https() ? 'https' : 'http'; $base_url .= '://'.$_SERVER['HTTP_HOST'] .str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']); } |