aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-02-09 17:28:30 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2013-02-09 17:28:30 +0100
commitd67d9566ce37e63c4df62d1f57fb03540421895c (patch)
tree5b6d5d0002f962f04c4706b3a722991a8e68c6ab /core/js/js.js
parent9dddcae9ca3dcf872893e36e2f478ebecafdc6e2 (diff)
parent5a309c11ca90589303c38084795432d3d23e393d (diff)
downloadnextcloud-server-d67d9566ce37e63c4df62d1f57fb03540421895c.tar.gz
nextcloud-server-d67d9566ce37e63c4df62d1f57fb03540421895c.zip
Merge branch 'master' into clean-app-id
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js4
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 = {};