commit 9d887b32a1fe998cbb0307a5e678ac3ba5076a1e
author Phil Sturgeon <email@philsturgeon.co.uk> Wed Aug 10 08:06:37 2011 -0600
committer Phil Sturgeon <email@philsturgeon.co.uk> Sat Aug 13 11:30:16 2011 -0600
tree 3d83cd6b475328d818efea9668e0bdee7b1c9abb
parent dd9b763ef18808637680237d78d8698799ccf8fa

Fixed conflicts in changelog.

system/libraries/Email.php

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index cd89f8f..03eccea 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -395,7 +395,7 @@
 	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;
 	}