summaryrefslogtreecommitdiffstats
path: root/system/libraries/Session.php
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-03-06 21:19:07 +0100
committerMike Funk <mfunk@xulonpress.com>2012-03-06 21:19:07 +0100
commit8f7db7bf06ab3014f80fdb730df13b57d87c2196 (patch)
treea61142583e19002db610e3ef74f3a9f0eedbd8e0 /system/libraries/Session.php
parentc91a66cd7c770f8060cbe366491c1f4de9147da4 (diff)
parent738f53448fecd1a27c7f89965fbfc47b3bafdb9b (diff)
updated and merged user guide with develop branch.
Diffstat (limited to 'system/libraries/Session.php')
-rw-r--r--system/libraries/Session.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index c14b11fa3..d90c7b42f 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -219,7 +219,7 @@ class CI_Session {
$this->CI->db->where('user_agent', $session['user_agent']);
}
- $query = $this->CI->db->get($this->sess_table_name);
+ $query = $this->CI->db->limit(1)->get($this->sess_table_name);
// No result? Kill it!
if ($query->num_rows() === 0)
@@ -454,7 +454,7 @@ class CI_Session {
*/
public function userdata($item)
{
- return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
+ return isset($this->userdata[$item]) ? $this->userdata[$item] : FALSE;
}
// --------------------------------------------------------------------
@@ -752,7 +752,7 @@ class CI_Session {
*/
protected function _unserialize($data)
{
- $data = @unserialize(strip_slashes($data));
+ $data = @unserialize(strip_slashes(trim($data)));
if (is_array($data))
{
@@ -760,9 +760,11 @@ class CI_Session {
return $data;
}
- return (is_string($data)) ? str_replace('{{slash}}', '\\', $data) : $data;
+ return is_string($data) ? str_replace('{{slash}}', '\\', $data) : $data;
}
+ // --------------------------------------------------------------------
+
/**
* Unescape slashes
*
@@ -802,7 +804,7 @@ class CI_Session {
{
$expire = $this->now - $this->sess_expiration;
- $this->CI->db->where("last_activity < {$expire}");
+ $this->CI->db->where('last_activity < '.$expire);
$this->CI->db->delete($this->sess_table_name);
log_message('debug', 'Session garbage collection performed.');