summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js4
1 files changed, 3 insertions, 1 deletions
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