summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.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_query_builder.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_query_builder.php')
-rw-r--r--system/database/DB_query_builder.php16
1 files changed, 8 insertions, 8 deletions
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);
}