diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-09 09:38:12 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-09 09:39:33 +0200 |
| commit | fc5ce4758d58fc3f720e38f32d63b5336d40293d (patch) | |
| tree | 0c2c1bc5a780f8f69b2b0181d828d757b005c1ac | |
| parent | 39d14ee22b128967ac0223a71099b7ce87b1e81e (diff) | |
Fix identity selection when opening extwindow from compose window
| -rw-r--r-- | program/js/editor.js | 2 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/program/js/editor.js b/program/js/editor.js index 3782de869..bc36e9a39 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -80,7 +80,7 @@ function rcmail_editor_callback() 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 09b53e990..2c2f7557a 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -508,7 +508,7 @@ function rcmail_compose_header_from($attrib) } } - $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); |