diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-06-27 17:51:37 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-06-27 17:54:17 +0200 |
| commit | c6bbccc776ee9ea1112d3cfab54c9f2c95540130 (patch) | |
| tree | 799c938b8d314a4f49fdeba43f5b42e212f77fcd /core/js/js.js | |
| parent | 969e43c87b7afb6184846fe27849167c9c6f5eab (diff) | |
| parent | 6fcee1ee117a167aa0c526ca39effbf086d10991 (diff) | |
| download | nextcloud-server-c6bbccc776ee9ea1112d3cfab54c9f2c95540130.tar.gz nextcloud-server-c6bbccc776ee9ea1112d3cfab54c9f2c95540130.zip | |
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
lib/setup.php
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index 3cb4d3dd151..08b429a555b 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -7,7 +7,10 @@ */ var oc_debug; var oc_webroot; -var oc_requesttoken; + +var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user'); +var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken'); + if (typeof oc_webroot === "undefined") { oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/')); } |