diff options
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | core/js/files/client.js | 2 | ||||
| -rw-r--r-- | core/js/js.js | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty b/3rdparty -Subproject 7a179f6709b083f921b92395335d071bc6a8eb6 +Subproject 951093d57436f0cc1904d5ce00bc155f87d2d2f diff --git a/core/js/files/client.js b/core/js/files/client.js index aa450df1773..f3838dd359a 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -281,8 +281,6 @@ path = path.substr(0, path.length - 1); } - path = decodeURIComponent(path); - if (response.propStat.length === 0 || response.propStat[0].status !== 'HTTP/1.1 200 OK') { return null; } diff --git a/core/js/js.js b/core/js/js.js index e7e1c301bb5..d78b0159cfa 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1383,10 +1383,12 @@ function initCore() { */ function initSessionHeartBeat() { // interval in seconds - var interval = 900; + var interval = NaN; if (oc_config.session_lifetime) { interval = Math.floor(oc_config.session_lifetime / 2); } + interval = isNaN(interval)? 900: interval; + // minimum one minute interval = Math.max(60, interval); // max interval in seconds set to 24 hours |