diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-12-13 05:35:29 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-12-13 05:35:29 -0800 |
| commit | ad998c1fb507648d4f48638c0818025f13a49dc0 (patch) | |
| tree | 7ea8b59348cbb71229f64fb9c83aefc18f36fb19 /core/js/js.js | |
| parent | 7b30ffbf23bb17e22511f0ba7bba53304590f170 (diff) | |
| parent | df1a404466340700cfe16d4a57c2bd964290d35a (diff) | |
| download | nextcloud-server-ad998c1fb507648d4f48638c0818025f13a49dc0.tar.gz nextcloud-server-ad998c1fb507648d4f48638c0818025f13a49dc0.zip | |
Merge pull request #6390 from owncloud/migration-fixwebroot
Fix webroot for update page
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) { |