summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorDaniel Hunsaker <danhunsaker@gmail.com>2013-03-04 10:04:25 +0100
committerDaniel Hunsaker <danhunsaker@gmail.com>2013-03-04 10:04:25 +0100
commite5d7af508680afced4c96b5a52a054c73b6c537e (patch)
tree133b6f7791b975bfc6ecb017ba3a8d862cdecb6c /system/libraries
parent3b5b7f48848d098c6190781f8790a1b0dcb0217c (diff)
parent5780d8b2078126f8eb5738658fceadd38c66fe5b (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Session/drivers/Session_cookie.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php
index 057e5a1d1..0e8644102 100644
--- a/system/libraries/Session/drivers/Session_cookie.php
+++ b/system/libraries/Session/drivers/Session_cookie.php
@@ -494,7 +494,7 @@ class CI_Session_cookie extends CI_Session_driver {
$this->userdata = array(
'session_id' => $this->_make_sess_id(),
'ip_address' => $this->CI->input->ip_address(),
- 'user_agent' => substr($this->CI->input->user_agent(), 0, 120),
+ 'user_agent' => trim(substr($this->CI->input->user_agent(), 0, 120)),
'last_activity' => $this->now,
);