[Pkg-owncloud-commits] [owncloud] 104/145: Now using PHP session lifetime as default value for the JS config

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 3d5d6b5ad109b6fa1936b200fd00d9f2d51e26bb
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Feb 17 21:32:40 2014 +0100

    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.
    
    Backport of f9763e1fc5106320c7984eff14546f6815ee80d2
---
 core/js/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/config.php b/core/js/config.php
index 517ea16..b6875fb 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)
 		)
 	)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git