summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-01-15 03:41:02 +0100
committerAndrey Andreev <narf@bofh.bg>2013-01-15 03:41:02 +0100
commitb26bb6ef76eb2f8327dafe085ae6bca14c22160b (patch)
treea9592331df604d054037a3759819a774fcf1410f /system/database
parent5b60a3bb74d39b8718081cb62c21f9f48e7a4a87 (diff)
parent912f1bcbc3d4f9b09695ab784d6985efbc4c9235 (diff)
Merge pull request #2152 from vlakoff/develop
Replace is_null() with === / !== NULL
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--system/database/DB_query_builder.php16
-rw-r--r--system/database/DB_result.php2
3 files changed, 10 insertions, 10 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';
}
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index dc2c5e702..ac377d996 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -644,7 +644,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
? $this->_group_get_type('')
: $this->_group_get_type($type);
- if ( ! is_null($v))
+ if ($v !== NULL)
{
if ($escape === TRUE)
{
@@ -1382,7 +1382,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$this->from($table);
}
- if ( ! is_null($where))
+ if ($where !== NULL)
{
$this->where($where);
}
@@ -1411,7 +1411,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*/
public function insert_batch($table = '', $set = NULL, $escape = NULL)
{
- if ( ! is_null($set))
+ if ($set !== NULL)
{
$this->set_insert_batch($set, '', $escape);
}
@@ -1567,7 +1567,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*/
public function insert($table = '', $set = NULL, $escape = NULL)
{
- if ( ! is_null($set))
+ if ($set !== NULL)
{
$this->set($set, '', $escape);
}
@@ -1633,7 +1633,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*/
public function replace($table = '', $set = NULL)
{
- if ( ! is_null($set))
+ if ($set !== NULL)
{
$this->set($set);
}
@@ -1742,7 +1742,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
// Combine any cached components with the current statements
$this->_merge_cache();
- if ( ! is_null($set))
+ if ($set !== NULL)
{
$this->set($set);
}
@@ -1815,12 +1815,12 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
// Combine any cached components with the current statements
$this->_merge_cache();
- if (is_null($index))
+ if ($index === NULL)
{
return ($this->db_debug) ? $this->display_error('db_must_use_index') : FALSE;
}
- if ( ! is_null($set))
+ if ($set !== NULL)
{
$this->set_update_batch($set, $index);
}
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index dfd8081fd..a044fd5dc 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -354,7 +354,7 @@ class CI_DB_result {
return;
}
- if ($key !== '' && ! is_null($value))
+ if ($key !== '' && $value !== NULL)
{
$this->row_data[$key] = $value;
}