From ceeab9ed917f63af9511299540339fd170a90a85 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Sun, 06 Dec 2009 03:02:29 -0500 Subject: [PATCH] - Allow setting only selected params in 'message_compose' hook (#1486312) --- CHANGELOG | 1 + program/steps/mail/compose.inc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bf126df..d621e10 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Allow setting only selected params in 'message_compose' hook (#1486312) - 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) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 2236d5f..a441e00 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -55,8 +55,8 @@ // pipe compose parameters thru plugins $plugin = $RCMAIL->plugins->exec_hook('message_compose', $_SESSION['compose']); - $_SESSION['compose']['param'] = $plugin['param']; - + $_SESSION['compose']['param'] = array_merge($_SESSION['compose']['param'], $plugin['param']); + // add attachments listed by message_compose hook if (is_array($plugin['attachments'])) { foreach ($plugin['attachments'] as $attach) { -- Gitblit v1.9.1