From 89a49dd37085d6693b7d7b99d08711695ec88592 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 09 Feb 2016 02:59:56 -0500
Subject: [PATCH] Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#1490657)
---
CHANGELOG | 1 +
plugins/additional_message_headers/composer.json | 2 +-
plugins/additional_message_headers/additional_message_headers.php | 16 ++++------------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 740f21b..a4c2e15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@
- Fix bug where Archive/Junk buttons were not active after page jump with select=all mode (#1490647)
- Fix bug in long recipients list parsing for cases where recipient name contained @-char (#1490653)
- Plugin API: Added addressbook_export hook
+- Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#1490657)
RELEASE 1.2-beta
----------------
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;
}
diff --git a/plugins/additional_message_headers/composer.json b/plugins/additional_message_headers/composer.json
index bf3f6c4..aa72c7c 100644
--- a/plugins/additional_message_headers/composer.json
+++ b/plugins/additional_message_headers/composer.json
@@ -3,7 +3,7 @@
"type": "roundcube-plugin",
"description": "Very simple plugin which will add additional headers to or remove them from outgoing messages.",
"license": "GPLv2",
- "version": "1.2.0",
+ "version": "1.2.1",
"authors": [
{
"name": "Ziba Scott",
--
Gitblit v1.9.1