diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-01-15 03:41:02 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-01-15 03:41:02 +0100 |
| commit | b26bb6ef76eb2f8327dafe085ae6bca14c22160b (patch) | |
| tree | a9592331df604d054037a3759819a774fcf1410f /system/libraries/Email.php | |
| parent | 5b60a3bb74d39b8718081cb62c21f9f48e7a4a87 (diff) | |
| parent | 912f1bcbc3d4f9b09695ab784d6985efbc4c9235 (diff) | |
Merge pull request #2152 from vlakoff/develop
Replace is_null() with === / !== NULL
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 2 |
1 files changed, 1 insertions, 1 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 = ''; |