summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2013-01-17 04:32:51 +0100
committerEric Roberts <eric@cryode.com>2013-01-17 04:32:51 +0100
commitbd6faca03fc7934a0ad1cff8584bfb49d2a43d49 (patch)
tree51e68684755b42a32e5a709479835be0fb891f9c /system/database/DB_driver.php
parent7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (diff)
parentb26bb6ef76eb2f8327dafe085ae6bca14c22160b (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 1e5e8c6f7..26791398a 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -993,7 +993,7 @@ abstract class CI_DB_driver {
{
return ($str === FALSE) ? 0 : 1;
}
- elseif (is_null($str))
+ elseif ($str === NULL)
{
return 'NULL';
}