summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-01-23 11:30:40 +0100
committerLukas Reschke <lukas@statuscode.ch>2013-01-23 11:30:40 +0100
commitc8bbbb48d3214d3ce141110aebcd59577d9e5c40 (patch)
treec7f41e33783878ee664f919ac5818066047dea10 /core/js
parent48949ba04acacd5cc4039ba15266619ebe61a52b (diff)
parentc986dbe5739347f3fd40fa17132169de9fd9494c (diff)
downloadnextcloud-server-c8bbbb48d3214d3ce141110aebcd59577d9e5c40.tar.gz
nextcloud-server-c8bbbb48d3214d3ce141110aebcd59577d9e5c40.zip
Merge master...
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 23ace89f4e3..6241036b1b8 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -88,7 +88,7 @@ var OC={
PERMISSION_DELETE:8,
PERMISSION_SHARE:16,
webroot:oc_webroot,
- appswebroots:oc_appswebroots,
+ appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
/**