From 0703bfecd0b9efca36caee4f7b9c64c4135d57af Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 10 Jul 2013 16:49:12 -0400
Subject: [PATCH] Merged configuration refactoring from 'dev_config' branch back into master (#1487311)

---
 plugins/additional_message_headers/additional_message_headers.php |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
index 21016dd..a430181 100644
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ b/plugins/additional_message_headers/additional_message_headers.php
@@ -6,7 +6,7 @@
  * Very simple plugin which will add additional headers
  * to or remove them from outgoing messages.
  *
- * Enable the plugin in config/main.inc.php and add your desired headers:
+ * Enable the plugin in config.inc.php and add your desired headers:
  * $rcmail_config['additional_message_headers'] = array('User-Agent');
  *
  * @version @package_version@
@@ -19,12 +19,12 @@
 
     function init()
     {
-        $this->add_hook('outgoing_message_headers', array($this, 'message_headers'));
+        $this->add_hook('message_outgoing_headers', array($this, 'message_headers'));
     }
 
     function message_headers($args)
     {
-	$this->load_config();
+    	$this->load_config();
 
         // additional email headers
         $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
@@ -39,5 +39,3 @@
         return $args;
     }
 }
-
-?>

--
Gitblit v1.9.1