diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-06 08:02:29 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-06 08:02:29 +0000 |
| commit | d957958d9ef389171b908c9448a2051290db64d5 (patch) | |
| tree | d05c0df8c238ad6146e9e720bfbdff2b7ebe7076 | |
| parent | 7933309d8746fb9bc2ffb489d7f568d9303bb21d (diff) | |
- Allow setting only selected params in 'message_compose' hook (#1486312)
git-svn-id: https://svn.roundcube.net/trunk@3166 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index bf126dfe4..d621e1015 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index 2236d5f57..a441e00b6 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -55,8 +55,8 @@ if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_v // 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) { |