From c8023ac6b1ffefb0f97746a15af40a4d260a2781 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 09 Feb 2016 03:01:42 -0500
Subject: [PATCH] Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#1490657)
---
plugins/additional_message_headers/additional_message_headers.php | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 0d16e60..58e4d41 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -24,22 +24,14 @@
{
$this->load_config();
- $headers = $args['message']->headers();
- $rcube = rcube::get_instance();
+ $rcube = rcube::get_instance();
// additional email headers
$additional_headers = $rcube->config->get('additional_message_headers', array());
- foreach ((array)$additional_headers as $header => $value) {
- if (null === $value) {
- unset($headers[$header]);
- }
- else {
- $headers[$header] = $value;
- }
- }
- $args['message']->_headers = array();
- $args['message']->headers($headers);
+ if (!empty($additional_headers)) {
+ $args['message']->headers($additional_headers, true);
+ }
return $args;
}
--
Gitblit v1.9.1