aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-02-09 19:15:23 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2013-02-09 19:15:23 +0100
commitb9089fe8d966b48e4c8dc3f06fd365fc506a0199 (patch)
tree36d04441896a142a69bba884ec6c8d9ba00d10b5 /core/js/js.js
parent05b46f78281e5df49a5c6a0513a37eaf03c3c29d (diff)
parent0222c589ac7c006c09dca6cea09cae9a1006a0b4 (diff)
downloadnextcloud-server-b9089fe8d966b48e4c8dc3f06fd365fc506a0199.tar.gz
nextcloud-server-b9089fe8d966b48e4c8dc3f06fd365fc506a0199.zip
Merge branch 'master' into fixing-1424-master
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 = {};