diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 03:27:22 -0800 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 03:27:22 -0800 |
commit | 800609aaeb67d954103c349e685f33cdd0169291 (patch) | |
tree | 6b059dd01a1d6967f01ec94e32434b7fea3b1c1b /core | |
parent | c91334c54a9061306502da0753e0df9b7068b6f8 (diff) | |
parent | d5f98a82aa5d1bee7971cb4c811b86083ce60ed6 (diff) | |
download | nextcloud-server-800609aaeb67d954103c349e685f33cdd0169291.tar.gz nextcloud-server-800609aaeb67d954103c349e685f33cdd0169291.zip |
Merge pull request #1545 from owncloud/fix-oc_webroot
fixup oc_webroot correctly before and after setup
Diffstat (limited to 'core')
-rw-r--r-- | core/js/js.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index c137f734d91..5f1870eb6ce 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -8,7 +8,9 @@ var oc_debug; var oc_webroot; var oc_requesttoken; -oc_webroot = oc_webroot || location.pathname.substr(0, location.pathname.lastIndexOf('/')); +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 = {}; |