]> source.dussan.org Git - nextcloud-server.git/commitdiff
Now using PHP session lifetime as default value for the JS config
authorVincent Petry <pvince81@owncloud.com>
Mon, 17 Feb 2014 20:32:40 +0000 (21:32 +0100)
committerVincent Petry <pvince81@owncloud.com>
Mon, 17 Feb 2014 20:33:04 +0000 (21:33 +0100)
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.

core/js/config.php

index 517ea1615a8fdf4187cf98f3244fc319ce6d6caf..b6875fb73f9aca2d7e3ff733461bda133f87eb0a 100644 (file)
@@ -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)
                )
        )