diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-12-16 22:38:22 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-12-16 22:38:22 +0100 |
| commit | 8f0c56c1b245ed7c6856080597b48ef3d82d1a24 (patch) | |
| tree | f87bc926726f9aeaa1692bc94355951e7d9f28a2 /core/js/js.js | |
| parent | 7afe6b349352f90bec5a8409bf5c23494f808f1a (diff) | |
| parent | 77b68505c2164330803ce5d5dcbb9fd07438e18d (diff) | |
| download | nextcloud-server-8f0c56c1b245ed7c6856080597b48ef3d82d1a24.tar.gz nextcloud-server-8f0c56c1b245ed7c6856080597b48ef3d82d1a24.zip | |
Merge branch 'master' into fix-5388-master
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index d9b3b54e0a1..5442039c294 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -12,7 +12,14 @@ var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('dat var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken'); if (typeof oc_webroot === "undefined") { - oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/')); + oc_webroot = location.pathname; + var pos = oc_webroot.indexOf('/index.php/'); + if (pos !== -1) { + oc_webroot = oc_webroot.substr(0, pos); + } + else { + oc_webroot = oc_webroot.substr(0, oc_webroot.lastIndexOf('/')); + } } if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { if (!window.console) { |