Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)

Conflicts:

	CHANGELOG

2 files changed, 8 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index dcd5bdf35..dd7c26c3b 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 d58eb087b..87103be93 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1438,6 +1438,13 @@ class rcube
         ));
 
         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;
         }