summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps
diff options
context:
space:
mode:
authortill <till@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-02-14 01:33:02 +0000
committertill <till@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-02-14 01:33:02 +0000
commitad4c3580fbfdfb58b25268fc8277259650b23e77 (patch)
treefea122fd8bf745803d1e84b4944ada0a0bf1f6e2 /roundcubemail/program/steps
parent5e382e9285ae0fe400b97b02cad5f879e6ff6d77 (diff)
* mime_content_type() is unavailable in PHP5 and breaks sending emails with attachments
* implemented rc_mime_content_type() with file_info-failover * added svn:ignore for phpinfo.php ;-) git-svn-id: https://svn.roundcube.net/trunk@1078 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
-rw-r--r--roundcubemail/program/steps/mail/sendmail.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 5a15a83ec..ede98e298 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -270,7 +270,10 @@ if (is_array($_SESSION['compose']['attachments']))
We need to replace mime_content_type in a later release because the function
is deprecated in favour of File_Info
*/
- $MAIL_MIME->addAttachment($attachment['path'], mime_content_type($attachment['path']), $attachment['name'], true, 'base64', 'attachment', $message_charset);
+ $MAIL_MIME->addAttachment($attachment['path'],
+ rc_mime_content_type($attachment['path'], $attachment['mimetype']),
+ $attachment['name'], true, 'base64',
+ 'attachment', $message_charset);
}
}