From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
plugins/additional_message_headers/additional_message_headers.php | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 80c58d5..43f9d00 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -15,29 +15,32 @@
*/
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();
+
+ $headers = $args['message']->headers();
+ $rcube = rcube::get_instance();
// additional email headers
- $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
- foreach($additional_headers as $header=>$value){
+ $additional_headers = $rcube->config->get('additional_message_headers', array());
+ foreach ((array)$additional_headers as $header => $value) {
if (null === $value) {
- unset($args['headers'][$header]);
- } else {
- $args['headers'][$header] = $value;
+ unset($headers[$header]);
+ }
+ else {
+ $headers[$header] = $value;
}
}
+
+ $args['message']->_headers = array();
+ $args['message']->headers($headers);
return $args;
}
}
-
-?>
--
Gitblit v1.9.1