From 8a6cbf07c05d11e8dc80d92c46b9de3d1d2cfaa9 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 28 Mar 2017 10:55:19 +0200
Subject: [PATCH] OO-2656: write the context path in the url of the WebDAV link
---
.../java/org/olat/core/commons/modules/bc/FolderManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/modules/bc/FolderManager.java b/src/main/java/org/olat/core/commons/modules/bc/FolderManager.java
index c4699a68b76..a50a762063a 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/FolderManager.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/FolderManager.java
@@ -36,6 +36,7 @@ import org.olat.core.commons.modules.bc.meta.MetaInfoFactory;
import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
import org.olat.core.helpers.Settings;
import org.olat.core.manager.BasicManager;
+import org.olat.core.util.WebappHelper;
import org.olat.core.util.vfs.OlatRelPathImpl;
import org.olat.core.util.vfs.VFSItem;
import org.olat.core.util.vfs.VFSLeaf;
@@ -53,14 +54,14 @@ public class FolderManager extends BasicManager {
*/
public static String getWebDAVHttp() {
if(Settings.isInsecurePortAvailable()) {
- return Settings.getInsecureServerContextPathURI() + "/webdav";
+ return Settings.getInsecureServerContextPathURI() + WebappHelper.getServletContextPath() + "/webdav";
}
return null;
}
public static String getWebDAVHttps() {
if(Settings.isSecurePortAvailable()) {
- return Settings.getSecureServerContextPathURI() + "/webdav";
+ return Settings.getSecureServerContextPathURI() + WebappHelper.getServletContextPath() + "/webdav";
}
return null;
}
--
GitLab