summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-12-14 15:48:24 +0100
committerAleksander Machniak <alec@alec.pl>2014-12-14 15:48:24 +0100
commitfa424e54d2e2f4a000e9fee46b2a65c6b51039bf (patch)
treea0e6b0097698ab424b77fbf9a713020a43cbf143
parent8e30385da9653c09480071daa9939aef2e9fd033 (diff)
Set compose mode in session when needed - skip one session update when composing new message
-rw-r--r--program/steps/mail/compose.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index e655e7bf2..5492f390d 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -131,8 +131,10 @@ else if ($msg_uid = $COMPOSE['param']['uid']) {
$compose_mode = RCUBE_COMPOSE_EDIT;
}
-$COMPOSE['mode'] = $compose_mode;
-$OUTPUT->set_env('compose_mode', $compose_mode);
+if ($compose_mode) {
+ $COMPOSE['mode'] = $compose_mode;
+ $OUTPUT->set_env('compose_mode', $compose_mode);
+}
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