summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-11 16:03:16 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-11 16:03:16 +0000
commitec910a781700d3c17d62423d44116e9747c5fb99 (patch)
tree4924753a8b359d10450f5345c23b1e00d27e75c5 /roundcubemail/program
parent82cdbe7707c21314509133818e73a82831ab6700 (diff)
- Revert r6060, fix #1487822 using css-only
git-svn-id: https://svn.roundcube.net/trunk@6062 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_json_output.php2
-rw-r--r--roundcubemail/program/steps/mail/list.inc8
2 files changed, 2 insertions, 8 deletions
diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php
index f062d4b71..99f08f5c9 100644
--- a/roundcubemail/program/include/rcube_json_output.php
+++ b/roundcubemail/program/include/rcube_json_output.php
@@ -212,7 +212,7 @@ class rcube_json_output
public function redirect($p = array(), $delay = 1)
{
$location = rcmail::get_instance()->url($p);
- $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);", JS_OBJECT_NAME, $location, $delay));
+ $this->remote_response("window.setTimeout(\"location.href='{$location}'\", $delay);");
exit;
}
diff --git a/roundcubemail/program/steps/mail/list.inc b/roundcubemail/program/steps/mail/list.inc
index 930758354..dad86663a 100644
--- a/roundcubemail/program/steps/mail/list.inc
+++ b/roundcubemail/program/steps/mail/list.inc
@@ -51,15 +51,9 @@ if ($cols = get_input_value('_cols', RCUBE_INPUT_GET))
$save_arr['list_cols'] = explode(',', $cols);
}
-if ($save_arr) {
+if ($save_arr)
$RCMAIL->user->save_prefs($save_arr);
- // force page reload if list columns changed in IE8 (#1487822)
- if ($save_arr['list_cols'] && $OUTPUT->browser->ie && $OUTPUT->browser->ver == 8) {
- $OUTPUT->redirect(array('_mbox' => $RCMAIL->storage->get_folder()), 0);
- }
-}
-
$mbox_name = $RCMAIL->storage->get_folder();
$threading = (bool) $RCMAIL->storage->get_threading();