From d3d1e38d7266106baf2bf2256a568691f3e55220 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 09 Jul 2013 03:38:12 -0400
Subject: [PATCH] Fix identity selection when opening extwindow from compose window
---
program/steps/mail/compose.inc | 2 +-
program/js/editor.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 240ec88..e403d1f 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -80,7 +80,7 @@
if (rcmail.env.default_font)
$(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);
- if (elem && elem.type == 'select-one' && !rcmail.env.opened_extwin) {
+ if (elem && elem.type == 'select-one') {
rcmail.change_identity(elem);
// Focus previously focused element
if (fe && fe.id != rcmail.env.composebody) {
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 08e0ad4..9ffde8a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -526,7 +526,7 @@
}
}
- $out = $select_from->show($MESSAGE->compose['from']);
+ $out = $select_from->show((int)$MESSAGE->compose['from']);
// add signatures to client
$OUTPUT->set_env('signatures', $a_signatures);
--
Gitblit v1.9.1