diff options
| author | Heesung Ahn <ahn.heesung@gmail.com> | 2015-03-30 18:10:10 +0200 |
|---|---|---|
| committer | Heesung Ahn <ahn.heesung@gmail.com> | 2015-03-30 18:10:10 +0200 |
| commit | 4c57d29e16878e2c2c116e82ab02d83bb3170c82 (patch) | |
| tree | 869638b9a3d241ca2eaa6a21dfa1ab6321ebb727 /system | |
| parent | 90e07bdaa034d98e23378c51105a8aea85878d07 (diff) | |
| parent | fd3105716f5cdede79b9b471561413c161db250c (diff) | |
Merge origin/develop into UnitTest_Loader
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Session/Session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index bb457c659..0549fef66 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -869,7 +869,7 @@ class CI_Session { public function set_tempdata($data, $value = NULL, $ttl = 300) { $this->set_userdata($data, $value); - $this->mark_as_temp($data, $ttl); + $this->mark_as_temp(is_array($data) ? array_keys($data) : $data, $ttl); } // ------------------------------------------------------------------------ |