diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-08 10:53:06 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-08 10:55:08 +0200 |
| commit | 39d14ee22b128967ac0223a71099b7ce87b1e81e (patch) | |
| tree | 3a8e71d664e98ea63a9fb2d5886d793e759c747c /program/steps/mail | |
| parent | 0cf43e310c497f81a80e14c97c06563f137340ad (diff) | |
Fix bug where signature wasn't changed on identity selection when editing a draft (#1489229)
Conflicts:
program/js/app.js
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/compose.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index b3844013b..09b53e990 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -170,6 +170,9 @@ $OUTPUT->set_env('compose_mode', $compose_mode); $config_show_sig = $RCMAIL->config->get('show_sig', 1); if ($compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT) { // don't add signature in draft/edit mode, we'll also not remove the old-one + // but only on page display, later we should be able to change identity/sig (#1489229) + if ($config_show_sig == 1 || $config_show_sig == 2) + $OUTPUT->set_env('show_sig_later', true); } else if ($config_show_sig == 1) $OUTPUT->set_env('show_sig', true); |