From e48f8945b32ab5b67f1cdeb53a37d3d196e31e4d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 May 2016 05:19:01 -0400
Subject: [PATCH] Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
---
plugins/additional_message_headers/additional_message_headers.php | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 0d16e60..5c07ec8 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -24,22 +24,32 @@
{
$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]);
+
+ if (!empty($additional_headers)) {
+ // Mail_mime >= 1.9.0
+ if (method_exists($message, 'isMultipart')) {
+ $args['message']->headers($additional_headers, true);
}
else {
- $headers[$header] = $value;
+ $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);
}
}
-
- $args['message']->_headers = array();
- $args['message']->headers($headers);
return $args;
}
--
Gitblit v1.9.1