summaryrefslogtreecommitdiffstats
path: root/system/libraries/Session.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-24 13:55:45 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-24 13:55:45 +0200
commit6763522d29416b7db90a6d3c5dceffe1536d8efe (patch)
treea8694c530b4467f496eeeba5fcd25c08654d4919 /system/libraries/Session.php
parentae9475557c1968826aee0fa5554899c8329412c2 (diff)
parent13a9bf472f548463682d4d3fafce146b9a9ced3c (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/libraries/Session.php')
-rw-r--r--system/libraries/Session.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 783109a60..4d6aa0ce8 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -276,7 +276,7 @@ class CI_Session {
$session = $this->CI->input->cookie($this->sess_cookie_name);
// No cookie? Goodbye cruel world!...
- if ($session === FALSE)
+ if ($session === NULL)
{
log_message('debug', 'A session cookie was not found.');
return FALSE;
@@ -586,7 +586,7 @@ class CI_Session {
*/
public function userdata($item)
{
- return isset($this->userdata[$item]) ? $this->userdata[$item] : FALSE;
+ return isset($this->userdata[$item]) ? $this->userdata[$item] : NULL;
}
// --------------------------------------------------------------------
@@ -715,7 +715,7 @@ class CI_Session {
{
// 'old' flashdata gets removed. Here we mark all
// flashdata as 'new' to preserve it from _flashdata_sweep()
- // Note the function will return FALSE if the $key
+ // Note the function will return NULL if the $key
// provided cannot be found
$value = $this->userdata($this->flashdata_key.':old:'.$key);