diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-04 16:19:30 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-01-04 16:19:30 +0100 |
| commit | 806e014ec46f739398d7510b07be62593e0c3377 (patch) | |
| tree | 64649cec7361540201ca3a99e3e95e7a05f312aa /system | |
| parent | 71b4a45a4de4ffd8e502d9632ffb6c5c099da94e (diff) | |
Close #4904
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Input.php | 6 | ||||
| -rw-r--r-- | system/helpers/cookie_helper.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index a7918aefb..0585b42fe 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -304,7 +304,7 @@ class CI_Input { * @param bool $httponly Whether to only makes the cookie accessible via HTTP (no javascript) * @return void */ - public function set_cookie($name, $value = '', $expire = '', $domain = '', $path = '/', $prefix = '', $secure = FALSE, $httponly = FALSE) + public function set_cookie($name, $value = '', $expire = 0, $domain = '', $path = '/', $prefix = '', $secure = FALSE, $httponly = FALSE) { if (is_array($name)) { @@ -343,9 +343,9 @@ class CI_Input { $httponly = config_item('cookie_httponly'); } - if ( ! is_numeric($expire)) + if ( ! is_numeric($expire) || $expire < 0) { - $expire = time() - 86500; + $expire = 1; } else { diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index 30b475ce6..d069cdb15 100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php @@ -59,7 +59,7 @@ if ( ! function_exists('set_cookie')) * * @param mixed * @param string the value of the cookie - * @param string the number of seconds until expiration + * @param int the number of seconds until expiration * @param string the cookie domain. Usually: .yourdomain.com * @param string the cookie path * @param string the cookie prefix @@ -67,7 +67,7 @@ if ( ! function_exists('set_cookie')) * @param bool true makes the cookie accessible via http(s) only (no javascript) * @return void */ - function set_cookie($name, $value = '', $expire = '', $domain = '', $path = '/', $prefix = '', $secure = FALSE, $httponly = FALSE) + function set_cookie($name, $value = '', $expire = 0, $domain = '', $path = '/', $prefix = '', $secure = FALSE, $httponly = FALSE) { // Set the config file options get_instance()->input->set_cookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httponly); |