diff options
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | system/libraries/Form_validation.php | 6 | ||||
| -rw-r--r-- | system/libraries/Ftp.php | 4 | ||||
| -rw-r--r-- | system/libraries/Javascript.php | 4 | ||||
| -rw-r--r-- | system/libraries/Table.php | 2 | ||||
| -rw-r--r-- | system/libraries/Unit_test.php | 4 | ||||
| -rw-r--r-- | system/libraries/User_agent.php | 2 | ||||
| -rw-r--r-- | system/libraries/Xmlrpc.php | 2 |
8 files changed, 13 insertions, 13 deletions
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; } |