diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-04-23 09:25:20 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-04-23 09:28:46 +0200 |
| commit | 293d61b16f5f23e163baf235764d8174a63c7346 (patch) | |
| tree | 1fe65e5d488af941b4fbcdfb930e73aae237dbe4 | |
| parent | 437c0dadd0ce22236ef43518353b07691c8f49dc (diff) | |
Fix so browser capabilities check is done really only once a session
Conflicts:
program/steps/mail/func.inc
| -rw-r--r-- | program/steps/mail/func.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index d1ca2a6a4..20ba29171 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -68,6 +68,10 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search']) $OUTPUT->set_env('search_text', $_SESSION['last_text_search']); } +if (!empty($_SESSION['browser_caps']) && !$OUTPUT->ajax_call) { + $OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']); +} + // set main env variables, labels and page title if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { // connect to storage server and trigger error on failure @@ -117,10 +121,6 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted', 'skip_deleted', 'display_next', 'message_extwin', 'compose_extwin', 'forward_attachment')); - if (!empty($_SESSION['browser_caps'])) { - $OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']); - } - if (!$OUTPUT->ajax_call) { $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage', |