summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-23 09:25:20 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-23 09:25:20 +0200
commit3b55b2f92b435630f56e63f5796471abacaaf425 (patch)
tree58537ecab5220cc87b3caa8a08f4b6eaa6514bc7
parent4c7a980aaadc3c97a250cae16f52926763a93521 (diff)
Fix so browser capabilities check is done really only once a session
-rw-r--r--program/steps/mail/func.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 027b2c142..10d30a5f3 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -83,6 +83,9 @@ if (($_uid = rcube_utils::get_input_value('_uid', RCUBE_INPUT_GPC)) && !is_arra
}
}
+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') {
@@ -136,10 +139,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',