diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-13 17:24:30 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-13 17:24:30 +0200 |
| commit | 8ee6c9379023df6594581e70827ba6196b3a2165 (patch) | |
| tree | 132a98413f34d44a9e4bd6f2d184691ee203a6b9 /system/libraries | |
| parent | 770c8677207be0a9091456b8d763bfd0e5456606 (diff) | |
| parent | 869e3721d75e9798a706d24d93170f44e5ab6cb3 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Profiler.php | 2 | ||||
| -rw-r--r-- | system/libraries/Session.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 330acce73..ac58129a9 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -506,7 +506,7 @@ class CI_Profiler { foreach ($this->CI->session->all_userdata() as $key => $val) { - if (is_array($val)) + if (is_array($val) || is_object($val)) { $val = print_r($val, TRUE); } diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 2c8a80163..8ee08c5b2 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -317,7 +317,8 @@ class CI_Session { 'session_id' => md5(uniqid($sessid, TRUE)), 'ip_address' => $this->CI->input->ip_address(), 'user_agent' => substr($this->CI->input->user_agent(), 0, 120), - 'last_activity' => $this->now + 'last_activity' => $this->now, + 'user_data' => '' ); |