diff options
| author | Eric Roberts <eric@cryode.com> | 2013-01-17 04:32:51 +0100 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2013-01-17 04:32:51 +0100 |
| commit | bd6faca03fc7934a0ad1cff8584bfb49d2a43d49 (patch) | |
| tree | 51e68684755b42a32e5a709479835be0fb891f9c /system/libraries/Email.php | |
| parent | 7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (diff) | |
| parent | b26bb6ef76eb2f8327dafe085ae6bca14c22160b (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
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 = ''; |