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:38:12 +0200 |
| commit | d3d1e38d7266106baf2bf2256a568691f3e55220 (patch) | |
| tree | 676a8191ddafc9bd9304f81b9c027dd6a26764db /program | |
| parent | c795d528f9ec913d8a5bd304d2a1b4ebef78b606 (diff) | |
Fix identity selection when opening extwindow from compose window
Diffstat (limited to 'program')
| -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 240ec882c..e403d1f63 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 08e0ad4c5..9ffde8a57 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -526,7 +526,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); |