From df1a404466340700cfe16d4a57c2bd964290d35a Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 13 Dec 2013 12:54:08 +0100 Subject: Fix webroot for update page On the update page, config.js was missing which caused oc_webroot to not be available. That would trigger the faulty oc_webroot fallback that didn't take URLs like "/owncloud/index.php/files/apps" into account. This fix adds config.js in the update page and also a fix for the oc_webroot fallback, in case it is used elsewhere. --- core/js/js.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'core/js') 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) { -- cgit v1.2.3