From a82dcd420a0b5266c543aa184fc0628f823e1d9f Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Sat, 05 Dec 2009 14:10:41 -0500 Subject: [PATCH] - Plugin API: added 'message_compose_body' hook (#1486285) --- CHANGELOG | 1 + program/steps/mail/compose.inc | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fe5a3dc..bf126df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Plugin API: added 'message_compose_body' hook (#1486285) - Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128) - Fix displaying alternative parts in messages of type message/rfc822 (#1486246) - Fix possible messages exposure when using Roundcube behind a proxy (#1486281) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 3a8a776..2236d5f 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -444,10 +444,11 @@ // load draft message body else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) $body = rcmail_create_draft_body($body, $isHtml); - } - else if (!empty($_SESSION['compose']['param']['body'])) - { - $body = $_SESSION['compose']['param']['body']; + + $plugin = $RCMAIL->plugins->exec_hook('message_compose_body', + array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode)); + + $body = $plugin['body']; } $out = $form_start ? "$form_start\n" : ''; -- Gitblit v1.9.1