diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-23 04:59:09 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-23 04:59:09 +0200 |
| commit | c2f59ef2d5d3ef28a113a11c24bee25eb03eeb56 (patch) | |
| tree | f704c46f5a71c7267cbf15e706a744a36e3da208 /system/core/Security.php | |
| parent | cf99aac39914d821e8864443d3aaa759f87258e9 (diff) | |
| parent | f5f898f8f30968fb36413a14de2dc6a4599b79a6 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/core/Security.php')
| -rw-r--r-- | system/core/Security.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Security.php b/system/core/Security.php index b22d2cf19..2fbc5b34c 100644 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -198,7 +198,7 @@ class CI_Security { $expire = time() + $this->_csrf_expire; $secure_cookie = (bool) config_item('cookie_secure'); - if ($secure_cookie && (empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) === 'off')) + if ($secure_cookie && ! is_https()) { return FALSE; } |