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

2 files changed, 8 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index bee0c30b7..96356cda2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
 - Set In-Reply-To and References for forwarded messages (#1489593)
 - Removed redundant default_folders config option (#1489737)
 - Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830)
+- Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)
 - Apply user-specific replacements to group's base_dn property (#1489779)
 - Fix mbox files import
 - Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 707929951..f2aeda7f0 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1479,6 +1479,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;
         }