summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-15 21:28:49 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-15 21:28:49 +0100
commitd11673b5fc09c28e06333946db0a3841eeea4024 (patch)
treed2a36791b5d574dd6d4c2937fc871235e160c376 /system/core
parent73abf95a507879d3893d933cc769e11275dbad75 (diff)
parentbeafe2fffbe5407f735caf2c286540d896d113f3 (diff)
Merge pull request #2245 from maltzurra/patch-1
Fixed is_https() to avoid incorrect detection.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 258cd4967..136dd521c 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -343,7 +343,7 @@ if ( ! function_exists('is_https'))
*/
function is_https()
{
- return ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off');
+ return (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) === 'on');
}
}
@@ -713,4 +713,4 @@ if ( ! function_exists('function_usable'))
}
/* End of file Common.php */
-/* Location: ./system/core/Common.php */ \ No newline at end of file
+/* Location: ./system/core/Common.php */