diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-10 16:06:37 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-13 19:30:16 +0200 |
| commit | 9d887b32a1fe998cbb0307a5e678ac3ba5076a1e (patch) | |
| tree | 3d83cd6b475328d818efea9668e0bdee7b1c9abb /system/libraries/Email.php | |
| parent | dd9b763ef18808637680237d78d8698799ccf8fa (diff) | |
Fixed conflicts in changelog.
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 cd89f8f3d..03eccea09 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -395,7 +395,7 @@ class CI_Email { public function attach($filename, $disposition = 'attachment') { $this->_attach_name[] = $filename; - $this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename)))); + $this->_attach_type[] = $this->_mime_types(pathinfo($filename, PATHINFO_EXTENSION)); $this->_attach_disp[] = $disposition; // Can also be 'inline' Not sure if it matters return $this; } |