summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-14 21:29:27 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-14 21:32:26 +0200
commitee3dd89c04a4359d39f6c10215aae5551f9914cf (patch)
tree2526f802dfa014618158befe8a5b74dd872c6eb0 /program/js
parent3a04a3d710e917703e03de6315858f564ebab028 (diff)
Fix invalid and infinite redirect for unsupported browsers
Conflicts: program/js/app.js
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 57b2c3ce6..49a74d2cb 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -142,7 +142,7 @@ function rcube_webmail()
this.task = this.env.task;
// check browser
- if (!bw.dom || !bw.xmlhttp_test() || (bw.mz && bw.vendver < 1.9)) {
+ if (this.env.server_error != 409 && (!bw.dom || !bw.xmlhttp_test() || (bw.mz && bw.vendver < 1.9))) {
this.goto_url('error', '_code=0x199');
return;
}
@@ -6796,7 +6796,7 @@ function rcube_webmail()
param[k] = query[k];
}
- return base + '&' + $.param(param) + querystring;
+ return base + (base.indexOf('?') > -1 ? '&' : '?') + $.param(param) + querystring;
};
this.redirect = function(url, lock)