summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-26 14:44:12 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-26 14:44:12 +0100
commit2f0db9af07013655393ba199a1890fbf0e55ba0f (patch)
tree54384b792a170cd33a0feb048933620a1dc94f76 /core
parent4b8717df9dc09bd097fec032fdc607b648e73e38 (diff)
parentcb14b1c58dbfc605352193020cdbf19da797bb69 (diff)
downloadnextcloud-server-2f0db9af07013655393ba199a1890fbf0e55ba0f.tar.gz
nextcloud-server-2f0db9af07013655393ba199a1890fbf0e55ba0f.zip
Merge pull request #7409 from owncloud/issue/5361
Add owncloud version to JS scope
Diffstat (limited to 'core')
-rw-r--r--core/js/config.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/js/config.php b/core/js/config.php
index c606ef35056..7e23f3e2e41 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -61,8 +61,10 @@ $array = array(
"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
"oc_config" => json_encode(
array(
- 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')),
- 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true)
+ 'session_lifetime' => \OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')),
+ 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true),
+ 'version' => implode('.', OC_Util::getVersion()),
+ 'versionstring' => OC_Util::getVersionString(),
)
),
"oc_defaults" => json_encode(