From a5f8c8307a9e4059dad2833712b9a612631a36ed Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Apr 2014 15:29:27 -0400
Subject: [PATCH] Fix invalid and infinite redirect for unsupported browsers
---
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 45e8dbe..d6403f7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -143,7 +143,7 @@
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 @@
param[k] = query[k];
}
- return base + '&' + $.param(param) + querystring;
+ return base + (base.indexOf('?') > -1 ? '&' : '?') + $.param(param) + querystring;
};
this.redirect = function(url, lock)
--
Gitblit v1.9.1