diff options
| author | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
|---|---|---|
| committer | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
| commit | b587698dd45396b91106bd7c894a79747b1fb7a9 (patch) | |
| tree | 76a1d614976dd0b695e513a40f9235e3b9f7f82c /system/libraries/Session/Session.php | |
| parent | 9b9a06c9635cd3b4fce0aebe4d2eead4809999a5 (diff) | |
| parent | fd363f224d7886eb686434d7a835eaa49183d8e6 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Session/Session.php')
| -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); } // ------------------------------------------------------------------------ |