summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-08-25 09:03:01 +0200
committerAleksander Machniak <alec@alec.pl>2013-08-25 09:03:01 +0200
commit6efadfc8d38730f3ee6d0bbcd53bdc24ef094116 (patch)
tree90c47cd6bf66152001d6f66e741c902f5f8c5ccd /program
parent1305079d75413743c3954ae0c3a1757b38676782 (diff)
Fix so additional headers are added to all messages sent (#1489284)
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube.php4
-rw-r--r--program/steps/mail/sendmail.inc1
2 files changed, 5 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index fbf9540ad..af9c069cf 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1397,6 +1397,10 @@ class rcube
'options' => $options,
));
+ if ($plugin['abort']) {
+ return isset($plugin['result']) ? $plugin['result'] : false;
+ }
+
$from = $plugin['from'];
$mailto = $plugin['mailto'];
$options = $plugin['options'];
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index cf22a2af9..1a92844c0 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -455,6 +455,7 @@ if (!empty($CONFIG['useragent'])) {
}
// exec hook for header checking and manipulation
+// Depracated: use message_before_send hook instead
$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));
// sending aborted by plugin