diff options
author | Sam Tuke <samtuke@owncloud.com> | 2013-02-09 11:52:11 +0000 |
---|---|---|
committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-09 11:52:11 +0000 |
commit | b95bc663af4135eff12a6a0c97afe37859f35094 (patch) | |
tree | 3ebb198e5f10ae34b9478b925e4a58d0be3c4aea /core/js/js.js | |
parent | d2b288ca704af4d74d1fa13e44966b1c34cf56bd (diff) | |
parent | ab4ae2b952fedf7bac2810bb6be7997fb661a1fc (diff) | |
download | nextcloud-server-b95bc663af4135eff12a6a0c97afe37859f35094.tar.gz nextcloud-server-b95bc663af4135eff12a6a0c97afe37859f35094.zip |
Merge branch 'master' into files_encryption-style-fixes
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
Diffstat (limited to 'core/js/js.js')
-rw-r--r-- | core/js/js.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js index 6b0c289850c..5f1870eb6ce 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -5,6 +5,12 @@ * To the end of config/config.php to enable debug mode. * The undefined checks fix the broken ie8 console */ +var oc_debug; +var oc_webroot; +var oc_requesttoken; +if (typeof oc_webroot === "undefined") { + oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/')); +} if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { if (!window.console) { window.console = {}; |