From b2d4cfa89a9d498f98b5d19ac496cf9f70f92070 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 09 Feb 2016 03:10:32 -0500
Subject: [PATCH] Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#1490657)
---
plugins/additional_message_headers/additional_message_headers.php | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index c54f77d..58e4d41 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -15,25 +15,22 @@
*/
class additional_message_headers extends rcube_plugin
{
- public $task = 'mail';
-
function init()
{
- $this->add_hook('message_outgoing_headers', array($this, 'message_headers'));
+ $this->add_hook('message_before_send', array($this, 'message_headers'));
}
function message_headers($args)
{
- $this->load_config();
+ $this->load_config();
+
+ $rcube = rcube::get_instance();
// additional email headers
- $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
- foreach($additional_headers as $header=>$value){
- if (null === $value) {
- unset($args['headers'][$header]);
- } else {
- $args['headers'][$header] = $value;
- }
+ $additional_headers = $rcube->config->get('additional_message_headers', array());
+
+ if (!empty($additional_headers)) {
+ $args['message']->headers($additional_headers, true);
}
return $args;
--
Gitblit v1.9.1