summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-07-08 10:53:06 +0200
committerAleksander Machniak <alec@alec.pl>2013-07-08 10:53:06 +0200
commit3b944edb02a838e92f5f849b1266f157ccfb7040 (patch)
tree15df66c1568a4080ce3b69ef6c071b71813f5945 /program/steps
parentcc02a90f92aafd005166821b3e698dc19a3aa777 (diff)
Fix bug where signature wasn't changed on identity selection when editing a draft (#1489229)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 329f63ee0..08e0ad4c5 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);