summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-11 15:30:19 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-11 15:30:19 +0000
commit55ae47cbb3bc219c5b381b29643d43fbfe644203 (patch)
treeb3d5e2c8c5e01c76ff1849fbcef6e72be9db0f78
parente190d37a300d93741ba9e7c31c39353d64986c01 (diff)
Force page reload if list columns changed in IE8 (#1487822)
git-svn-id: https://svn.roundcube.net/trunk@6060 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/include/rcube_json_output.php2
-rw-r--r--roundcubemail/program/steps/mail/list.inc8
3 files changed, 9 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 17375a497..d1c52f15f 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Force page reload if list columns changed in IE8 (#1487822)
- Allow mass-removal of addresses from a group (#1487748)
- Fix removing all contacts on import to LDAP addressbook
- Fix so "Back" from compose/show doesn't reset search request (#1488238)
diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php
index 99f08f5c9..f062d4b71 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("window.setTimeout(\"location.href='{$location}'\", $delay);");
+ $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);", JS_OBJECT_NAME, $location, $delay));
exit;
}
diff --git a/roundcubemail/program/steps/mail/list.inc b/roundcubemail/program/steps/mail/list.inc
index dad86663a..930758354 100644
--- a/roundcubemail/program/steps/mail/list.inc
+++ b/roundcubemail/program/steps/mail/list.inc
@@ -51,9 +51,15 @@ 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();