summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-20 12:14:53 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-20 12:14:53 +0100
commitf88681873b8b556d58f22a3e99c916eadbcb6171 (patch)
tree9011975331ec052ad036a1cee1bebc66eed20f34 /system
parent7e087f5e07c4630092a1d6ecdd103dc15f48e573 (diff)
Replace AND with &&
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Session.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index b8c623584..c331d99f7 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -25,8 +25,6 @@
* @filesource
*/
-// ------------------------------------------------------------------------
-
/**
* Session Class
*
@@ -94,7 +92,7 @@ class CI_Session {
}
// Are we using a database? If so, load it
- if ($this->sess_use_database === TRUE AND $this->sess_table_name != '')
+ if ($this->sess_use_database === TRUE && $this->sess_table_name != '')
{
$this->CI->load->database();
}
@@ -232,7 +230,7 @@ class CI_Session {
// Is there custom data? If so, add it to the main session array
$row = $query->row();
- if (isset($row->user_data) AND $row->user_data != '')
+ if (isset($row->user_data) && $row->user_data != '')
{
$custom_data = $this->_unserialize($row->user_data);