summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-30 14:27:49 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-30 14:30:34 +0200
commit8b5d16d30a48ea5b4afda7019dd09dbcd303194f (patch)
treeaa9cb61edf1b3bcf04ebe71d2f3de98a00fe8fda /program/lib/Roundcube/rcube.php
parent34e6526c958f3a0143a2cf5c8f1b9be29ebd65ef (diff)
Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)
Conflicts: CHANGELOG
Diffstat (limited to 'program/lib/Roundcube/rcube.php')
-rw-r--r--program/lib/Roundcube/rcube.php7
1 files changed, 7 insertions, 0 deletions
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;
}