summaryrefslogtreecommitdiffstats
path: root/system
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
parent7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (diff)
parentb26bb6ef76eb2f8327dafe085ae6bca14c22160b (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
Diffstat (limited to 'system')
-rw-r--r--system/core/Loader.php8
-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
-rw-r--r--system/libraries/Email.php2
-rw-r--r--system/libraries/Form_validation.php6
-rw-r--r--system/libraries/Ftp.php4
-rw-r--r--system/libraries/Javascript.php4
-rw-r--r--system/libraries/Table.php2
-rw-r--r--system/libraries/Unit_test.php4
-rw-r--r--system/libraries/User_agent.php2
-rw-r--r--system/libraries/Xmlrpc.php2
12 files changed, 27 insertions, 27 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 4d95d6288..1ad07f1fa 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -205,7 +205,7 @@ class CI_Loader {
return;
}
- if ( ! is_null($params) && ! is_array($params))
+ if ($params !== NULL && ! is_array($params))
{
$params = NULL;
}
@@ -975,7 +975,7 @@ class CI_Loader {
// Before we deem this to be a duplicate request, let's see
// if a custom object name is being supplied. If so, we'll
// return a new instance of the object
- if ( ! is_null($object_name))
+ if ($object_name !== NULL)
{
$CI =& get_instance();
if ( ! isset($CI->$object_name))
@@ -1014,7 +1014,7 @@ class CI_Loader {
// Before we deem this to be a duplicate request, let's see
// if a custom object name is being supplied. If so, we'll
// return a new instance of the object
- if ( ! is_null($object_name))
+ if ($object_name !== NULL)
{
$CI =& get_instance();
if ( ! isset($CI->$object_name))
@@ -1144,7 +1144,7 @@ class CI_Loader {
// Was a custom class name supplied? If so we'll use it
$class = strtolower($class);
- if (is_null($object_name))
+ if ($object_name === NULL)
{
$classvar = isset($this->_ci_varmap[$class]) ? $this->_ci_varmap[$class] : $class;
}
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;
}
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 1834be239..997757b0a 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1335,7 +1335,7 @@ class CI_Email {
for ($i = 0, $c = count($this->_attachments), $z = 0; $i < $c; $i++)
{
$filename = $this->_attachments[$i]['name'][0];
- $basename = is_null($this->_attachments[$i]['name'][1])
+ $basename = ($this->_attachments[$i]['name'][1] === NULL)
? basename($filename) : $this->_attachments[$i]['name'][1];
$ctype = $this->_attachments[$i]['type'];
$file_content = '';
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index c405eb6b1..bbd0b523e 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -511,7 +511,7 @@ class CI_Form_validation {
{
foreach ($this->_field_data as $field => $row)
{
- if ( ! is_null($row['postdata']))
+ if ($row['postdata'] !== NULL)
{
if ($row['is_array'] === FALSE)
{
@@ -583,7 +583,7 @@ class CI_Form_validation {
// If the field is blank, but NOT required, no further tests are necessary
$callback = FALSE;
- if ( ! in_array('required', $rules) && is_null($postdata))
+ if ( ! in_array('required', $rules) && $postdata === NULL)
{
// Before we bail out, does the rule contain a callback?
if (preg_match('/(callback_\w+(\[.*?\])?)/', implode(' ', $rules), $match))
@@ -598,7 +598,7 @@ class CI_Form_validation {
}
// Isset Test. Typically this rule will only apply to checkboxes.
- if (is_null($postdata) && $callback === FALSE)
+ if ($postdata === NULL && $callback === FALSE)
{
if (in_array('isset', $rules, TRUE) OR in_array('required', $rules))
{
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index b8729a9c7..dc6bbd226 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -266,7 +266,7 @@ class CI_FTP {
}
// Set file permissions if needed
- if ( ! is_null($permissions))
+ if ($permissions !== NULL)
{
$this->chmod($path, (int) $permissions);
}
@@ -320,7 +320,7 @@ class CI_FTP {
}
// Set file permissions if needed
- if ( ! is_null($permissions))
+ if ($permissions !== NULL)
{
$this->chmod($rempath, (int) $permissions);
}
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 542a0ecde..7f1d85511 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -737,7 +737,7 @@ class CI_Javascript {
{
// JSON data can optionally be passed to this function
// either as a database result object or an array, or a user supplied array
- if ( ! is_null($result))
+ if ($result !== NULL)
{
if (is_object($result))
{
@@ -823,7 +823,7 @@ class CI_Javascript {
*/
protected function _prep_args($result, $is_key = FALSE)
{
- if (is_null($result))
+ if ($result === NULL)
{
return 'null';
}
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 865699052..b77fcf19d 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -291,7 +291,7 @@ class CI_Table {
{
// The table data can optionally be passed to this function
// either as a database result object or an array
- if ( ! is_null($table_data))
+ if ($table_data !== NULL)
{
if (is_object($table_data))
{
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index de8c9bb80..7a67c7276 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -356,12 +356,12 @@ class CI_Unit_test {
*/
protected function _parse_template()
{
- if ( ! is_null($this->_template_rows))
+ if ($this->_template_rows !== NULL)
{
return;
}
- if (is_null($this->_template) OR ! preg_match('/\{rows\}(.*?)\{\/rows\}/si', $this->_template, $match))
+ if ($this->_template === NULL OR ! preg_match('/\{rows\}(.*?)\{\/rows\}/si', $this->_template, $match))
{
$this->_default_template();
return;
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 542deb738..1f4b2fa52 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -158,7 +158,7 @@ class CI_User_agent {
$this->agent = trim($_SERVER['HTTP_USER_AGENT']);
}
- if ( ! is_null($this->agent) && $this->_load_agent_file())
+ if ($this->agent !== NULL && $this->_load_agent_file())
{
$this->_compile_data();
}
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index c3c7690f0..9e60791ae 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -368,7 +368,7 @@ class CI_Xmlrpc {
*/
public function timeout($seconds = 5)
{
- if ( ! is_null($this->client) && is_int($seconds))
+ if ($this->client !== NULL && is_int($seconds))
{
$this->client->timeout = $seconds;
}