summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-07 10:20:59 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-07 10:20:59 +0100
commitf3d49a89fe99e2d47779b42f9c74a10a67213b0f (patch)
tree0a8da6371692be98f168ecb11188d06a6d52cee7 /core
parent0c3d97921fef6f0c831b1ba8da98933a8e9c87ae (diff)
parent728648ad77ba3d96d8e61f95a748702df3d615bd (diff)
downloadnextcloud-server-f3d49a89fe99e2d47779b42f9c74a10a67213b0f.tar.gz
nextcloud-server-f3d49a89fe99e2d47779b42f9c74a10a67213b0f.zip
Merge pull request #11131 from owncloud/use-phpini-wrapper
Replacing ini_get instances with inigetwrapper usages
Diffstat (limited to 'core')
-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 463e334ef26..8956689e74e 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -136,7 +136,7 @@ $array = array(
"firstDay" => json_encode($l->getFirstWeekDay()) ,
"oc_config" => json_encode(
array(
- 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), ini_get('session.gc_maxlifetime')),
+ 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true),
'version' => implode('.', OC_Util::getVersion()),
'versionstring' => OC_Util::getVersionString(),