From efe06f2b12b6483d7255c6e4f748a436d8faeb47 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 09 Feb 2016 03:10:45 -0500 Subject: [PATCH] Bring back additional_message_headers compatibility with Mail_Mime < 1.9 --- plugins/additional_message_headers/additional_message_headers.php | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php index 58e4d41..5c07ec8 100644 --- a/plugins/additional_message_headers/additional_message_headers.php +++ b/plugins/additional_message_headers/additional_message_headers.php @@ -30,7 +30,25 @@ $additional_headers = $rcube->config->get('additional_message_headers', array()); if (!empty($additional_headers)) { - $args['message']->headers($additional_headers, true); + // Mail_mime >= 1.9.0 + if (method_exists($message, 'isMultipart')) { + $args['message']->headers($additional_headers, true); + } + else { + $headers = $args['message']->headers(); + + foreach ((array) $additional_headers as $header => $value) { + if ($value === null) { + unset($headers[$header]); + } + else { + $headers[$header] = $value; + } + } + + $args['message']->_headers = array(); + $args['message']->headers($headers); + } } return $args; -- Gitblit v1.9.1