From 30e8a4a925222cd9309acb0e3a232c11bc0966ac Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 25 Jul 2008 15:13:15 +0000 Subject: 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 --- roundcubemail/program/steps/mail/sendmail.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'roundcubemail/program/steps/mail/sendmail.inc') 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'], -- cgit v1.2.3