diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-07-25 15:13:15 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-07-25 15:13:15 +0000 |
| commit | 30e8a4a925222cd9309acb0e3a232c11bc0966ac (patch) | |
| tree | 49804a3abefe17b541169f2c3898d4d45ea36269 /roundcubemail/program/steps/mail/sendmail.inc | |
| parent | e16836636624b9e0fac96fab586a27fdc75231fa (diff) | |
Prefer File_Info over mime_content_type + detect mime type when uploading + some code style
git-svn-id: https://svn.roundcube.net/trunk@1610 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/sendmail.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index babde48b9..75000d4aa 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -284,12 +284,7 @@ if (is_array($_SESSION['compose']['attachments'])) } else { - /* - We need to replace mime_content_type in a later release because the function - is deprecated in favour of File_Info - */ - $ctype = rc_mime_content_type($attachment['path'], $attachment['mimetype']); - $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914 + $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914 // .eml attachments send inline $MAIL_MIME->addAttachment($attachment['path'], |