diff options
author | Derek Jones <derek.jones@ellislab.com> | 2010-10-07 16:31:40 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2010-10-07 16:31:40 +0200 |
commit | aa7d3f9c04c165f6514aff58596ad7cff89ebe65 (patch) | |
tree | 45dcf3255ecdbf74965a844e7e66a8aac560cdd7 /system/libraries/Session.php | |
parent | dd6719738936be31cdaa1758ca86d5eb14dcab3d (diff) | |
parent | 124ac667046bfb662f4165934d953c0c8bded284 (diff) |
Automated merge with https://bitbucket.org/barrymieny/codeigniter
Diffstat (limited to 'system/libraries/Session.php')
-rw-r--r-- | system/libraries/Session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 342c301e3..1e606de9c 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -61,7 +61,7 @@ class CI_Session { // Set all the session preferences, which can either be set // manually via the $params array above or via the config file - foreach (array('sess_encrypt_cookie', 'sess_use_database', 'sess_table_name', 'sess_expiration', 'sess_match_ip', 'sess_match_useragent', 'sess_cookie_name', 'cookie_path', 'cookie_domain', 'sess_time_to_update', 'time_reference', 'cookie_prefix', 'encryption_key') as $key) + foreach (array('sess_encrypt_cookie', 'sess_use_database', 'sess_table_name', 'sess_expiration', 'sess_expire_on_close', 'sess_match_ip', 'sess_match_useragent', 'sess_cookie_name', 'cookie_path', 'cookie_domain', 'sess_time_to_update', 'time_reference', 'cookie_prefix', 'encryption_key') as $key) { $this->$key = (isset($params[$key])) ? $params[$key] : $this->CI->config->item($key); } |