diff options
| -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 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) |