diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-04-14 21:29:27 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-04-14 21:29:27 +0200 |
| commit | a5f8c8307a9e4059dad2833712b9a612631a36ed (patch) | |
| tree | aa67546877bf518275e313a3fcfbf0716e39116a | |
| parent | ed1222e45300f61d1df0f2e7ec78b2213cca6205 (diff) | |
Fix invalid and infinite redirect for unsupported browsers
| -rw-r--r-- | program/js/app.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js index 45e8dbeea..d6403f7ac 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -143,7 +143,7 @@ function rcube_webmail() this.task = this.env.task; // check browser - if (!bw.dom || !bw.xmlhttp_test() || (bw.mz && bw.vendver < 1.9) || (bw.ie && bw.vendver < 7)) { + if (this.env.server_error != 409 && (!bw.dom || !bw.xmlhttp_test() || (bw.mz && bw.vendver < 1.9) || (bw.ie && bw.vendver < 7))) { this.goto_url('error', '_code=0x199'); return; } @@ -6843,7 +6843,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) |