diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-02-18 00:32:40 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-02-18 13:53:35 +0400 |
| commit | 3d5d6b5ad109b6fa1936b200fd00d9f2d51e26bb (patch) | |
| tree | 753a9d453acb18686e3bf37065ad01a0d3072464 | |
| parent | 80dcec773abd0bd87f0a1afc1f42b6f8df5b1923 (diff) | |
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
| -rw-r--r-- | core/js/config.php | 2 |
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) ) ) |