diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-18 10:30:25 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-18 10:30:25 +0100 |
| commit | 92560c5b86cb88920b6e439bdf4b90f1d59e9b6c (patch) | |
| tree | 6f36bfee7c42d87a4a2e6abda23663808ac7dda8 /core | |
| parent | 5d3fc037503729c4497615eee2e6a20410654470 (diff) | |
| parent | f9763e1fc5106320c7984eff14546f6815ee80d2 (diff) | |
| download | nextcloud-server-92560c5b86cb88920b6e439bdf4b90f1d59e9b6c.tar.gz nextcloud-server-92560c5b86cb88920b6e439bdf4b90f1d59e9b6c.zip | |
Merge pull request #7243 from owncloud/core-sessionlifetimedefault
Now using PHP session lifetime as default value for the JS config
Diffstat (limited to 'core')
| -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) ) ) |