summaryrefslogtreecommitdiffstats
path: root/core/js/config.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-02-17 21:32:40 +0100
committerVincent Petry <pvince81@owncloud.com>2014-02-17 21:33:04 +0100
commitf9763e1fc5106320c7984eff14546f6815ee80d2 (patch)
tree011c3cf3aaa907c761616d2ea7e22a428d31a186 /core/js/config.php
parentd7f454771769d37e06136332f15695a98275f0f5 (diff)
downloadnextcloud-server-f9763e1fc5106320c7984eff14546f6815ee80d2.tar.gz
nextcloud-server-f9763e1fc5106320c7984eff14546f6815ee80d2.zip
Now using PHP session lifetime as default value for the JS config
This will fix the heartbeat when the session_lifetime config parameter hasn't been set explicitly.
Diffstat (limited to 'core/js/config.php')
-rw-r--r--core/js/config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/config.php b/core/js/config.php
index 517ea1615a8..b6875fb73f9 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -57,7 +57,7 @@ $array = array(
"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
"oc_config" => json_encode(
array(
- 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', 60 * 60 * 24),
+ 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')),
'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true)
)
)