summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-05-31 17:26:30 +0200
committerVincent Petry <pvince81@owncloud.com>2014-05-31 17:26:30 +0200
commit56b60b9cd283764931f24054b966d0cc6594da89 (patch)
tree886732113199f4944199c190663769494a418d64
parentcff9440a37a64a43403b7dd57a99a203410e426a (diff)
parenta0987ebf594d7f9ae48cd0b69c31759693755a65 (diff)
downloadnextcloud-server-56b60b9cd283764931f24054b966d0cc6594da89.tar.gz
nextcloud-server-56b60b9cd283764931f24054b966d0cc6594da89.zip
Merge pull request #8798 from owncloud/fix-corejs
Fix undefined JS on login/setup page
-rw-r--r--core/js/js.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js
index e31f67cca9c..cf35d8aac6a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -179,9 +179,9 @@ var OC={
webroot:oc_webroot,
appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
- config: oc_config,
- appConfig: oc_appconfig || {},
- theme: oc_defaults || {},
+ config: window.oc_config,
+ appConfig: window.oc_appconfig || {},
+ theme: window.oc_defaults || {},
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
/**