diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 19:24:45 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 19:24:45 +0200 |
| commit | 044a5221843cc2d88b936f3e658a1df4bc28cfe2 (patch) | |
| tree | 9845376e277aa822c41835c8ca8bc94a4cf23756 /system/libraries/Session.php | |
| parent | 47a62548cfdcd5fb6588a2caa92d3b55ac05de6f (diff) | |
| parent | d1ecd5cd4ae6ab5d37df9fbda14b93977b9e743c (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Session.php')
| -rw-r--r-- | system/libraries/Session.php | 3 |
1 files changed, 2 insertions, 1 deletions
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' => '' ); |