diff options
author | Matteo Mattei <matteo.mattei@gmail.com> | 2012-03-15 16:03:58 +0100 |
---|---|---|
committer | Matteo Mattei <matteo.mattei@gmail.com> | 2012-03-15 16:03:58 +0100 |
commit | df59c687a2243142e6da9d7b904523a1b91ca09b (patch) | |
tree | 49822495cd84ac837c1205b69c9eba37b476c3f2 /system | |
parent | 5a98a3dda56f6167f8241a7bc7d1c8784d98ccf9 (diff) |
Email class: adjust documentation and make the code backward compatible
Diffstat (limited to 'system')
-rw-r--r-- | system/libraries/Email.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index df03eaaf6..7320ea566 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -408,10 +408,10 @@ class CI_Email { * @param string * @return object */ - public function attach($filename, $str = '', $mime = '', $disposition = '', $newname = NULL) + public function attach($filename, $disposition = '', $str = '', $mime = '', $newname = NULL) { $this->_attach_name[] = array($filename, $newname); - $this->_attach_type[] = ($mime === '') ? $this->_mime_types(pathinfo($filename, PATHINFO_EXTENSION)) : $mime; + $this->_attach_type[] = ($mime == '') ? $this->_mime_types(pathinfo($filename, PATHINFO_EXTENSION)) : $mime; $this->_attach_disp[] = empty($disposition) ? 'attachment' : $disposition; // Can also be 'inline' Not sure if it matters $this->_attach_content[] = $str; return $this; |