summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-01 23:54:42 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-01 23:54:42 +0100
commit1de34fffad39f4c31516ef75e0d6552ef587aeae (patch)
treea1624a696da18dff4aef0c53dc392c6d39604dbb /system
parent2b3edbddf2398f225836d5763d112f331fe607ed (diff)
parent27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-postgre
Diffstat (limited to 'system')
-rwxr-xr-xsystem/core/Config.php2
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']);
}