diff options
| -rw-r--r-- | system/libraries/Email.php | 9 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index d24a30493..e012545d9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -418,7 +418,7 @@ class CI_Email { * @param string * @return void */ - public function attach($filename, $disposition = 'attachment', $newname=NULL) + public function attach($filename, $disposition = 'attachment', $newname = NULL) { $this->_attach_name[] = array($filename, $newname); $this->_attach_type[] = $this->_mime_types(pathinfo($filename, PATHINFO_EXTENSION)); @@ -1152,12 +1152,7 @@ class CI_Email { for ($i=0; $i < count($this->_attach_name); $i++) { $filename = $this->_attach_name[$i][0]; - $basename = $this->_attach_name[$i][1]; - - if( ! $basename) - { - $basename = basename($filename); - } + $basename = is_null($this->_attach_name[$i][1]) ? basename($filename) : $this->_attach_name[$i][1]; $ctype = $this->_attach_type[$i]; diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b9ca39cee..dff4f001d 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -44,7 +44,8 @@ Release Date: Not Released - Added max_filename_increment config setting for Upload library. - CI_Loader::_ci_autoloader() is now a protected method. - Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library <libraries/form_validation>`. - + - Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname) + - Core - Changed private functions in CI_URI to protected so MY_URI can |