diff options
| -rw-r--r-- | system/database/DB_query_builder.php | 2 | ||||
| -rw-r--r-- | system/libraries/Email.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 978fc6af7..ac377d996 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1202,7 +1202,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { */ public function limit($value, $offset = FALSE) { - $value === NULL OR $this->qb_limit = (int) $value; + is_null($value) OR $this->qb_limit = (int) $value; empty($offset) OR $this->qb_offset = (int) $offset; return $this; diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 3a386456d..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 = $this->_attachments[$i]['name'][1] === NULL + $basename = ($this->_attachments[$i]['name'][1] === NULL) ? basename($filename) : $this->_attachments[$i]['name'][1]; $ctype = $this->_attachments[$i]['type']; $file_content = ''; |