updated mimemail

This commit is contained in:
2019-01-27 14:43:42 +01:00
parent 5510ac0abf
commit 79db3e3896
16 changed files with 149 additions and 48 deletions

View File

@@ -85,7 +85,7 @@ function mimemail_admin_settings() {
'#access' => count($formats) > 1,
'#attributes' => array('class' => array('filter-list')),
'#description' => t('The filter set that will be applied to the message body.
If you are using Mime Mail as default mail sytem, make sure to enable
If you are using Mime Mail as default mail system, make sure to enable
"Convert line breaks into HTML" and "Convert URLs into links" with a long
enough maximum length for e.g. password reset URLs!'),
);

View File

@@ -75,13 +75,13 @@ function mimemail_parse($message) {
// We're dealing with a multi-part message.
$mail['parts'] = mimemail_parse_boundary($mail);
foreach ($mail['parts'] as $i => $part_body) {
foreach ($mail['parts'] as $part_body) {
$part = mimemail_parse_headers($part_body);
$sub_parts = mimemail_parse_boundary($part);
// Content is encoded in a multipart/alternative section.
if (count($sub_parts) > 1) {
foreach ($sub_parts as $j => $sub_part_body) {
foreach ($sub_parts as $sub_part_body) {
$sub_part = mimemail_parse_headers($sub_part_body);
if ($sub_part['content-type'] == 'text/plain') {
$mail['text'] = mimemail_parse_content($sub_part);

View File

@@ -29,7 +29,6 @@ class MimeMailSystem implements MailSystemInterface {
}
$engine = variable_get('mimemail_engine', 'mimemail');
$mailengine = $engine . '_mailengine';
$engine_prepare_message = $engine . '_prepare_message';
if (function_exists($engine_prepare_message)) {