From 8b5d16d30a48ea5b4afda7019dd09dbcd303194f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 30 Apr 2014 08:30:34 -0400
Subject: [PATCH] Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)
---
program/lib/Roundcube/rcube.php | 7 +++++++
CHANGELOG | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index dcd5bdf..dd7c26c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
+- Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)
- Fix missing email address when importing contacts from outlook csv (#1489830)
-- Apply user-specific replacements to group's base_dn property (#1489779)
- Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
- Fix "washing" of unicoded style attributes (#1489777)
- Fix unintentional redirect from compose page in Webkit browsers (#1489789)
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index d58eb08..87103be 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1438,6 +1438,13 @@
));
if ($plugin['abort']) {
+ if (!empty($plugin['error'])) {
+ $error = $plugin['error'];
+ }
+ if (!empty($plugin['body_file'])) {
+ $body_file = $plugin['body_file'];
+ }
+
return isset($plugin['result']) ? $plugin['result'] : false;
}
--
Gitblit v1.9.1