From 86dea3d507cb64904c36378f2aa4c3d5f73f5975 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Thu, 10 Oct 2013 08:56:30 +0200
Subject: [PATCH] OO-814 fix resolving of images in CP editor
---
.../org/olat/ims/cp/ui/VFSRootCPContainer.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/ims/cp/ui/VFSRootCPContainer.java b/src/main/java/org/olat/ims/cp/ui/VFSRootCPContainer.java
index 412a652c471..298a6f35cf4 100644
--- a/src/main/java/org/olat/ims/cp/ui/VFSRootCPContainer.java
+++ b/src/main/java/org/olat/ims/cp/ui/VFSRootCPContainer.java
@@ -111,14 +111,12 @@ public class VFSRootCPContainer extends AbstractVirtualContainer implements VFSC
@Override
public VFSItem resolve(String path) {
- // 1) try to resolve directly from root (editor initialization)
- if (!path.startsWith("/")) {
- VFSItem item = rootContainer.resolve(path);
- if (item != null) {
- return item;
- }
-
+ // 1) try to resolve directly from root (HTML editor instance)
+ VFSItem item = rootContainer.resolve(path);
+ if (item != null) {
+ return item;
}
+
// 2) try to resolve from virtual containers (events from link chooser)
for(VFSItem root:roots) {
if(root instanceof VFSContainer) {
@@ -126,7 +124,7 @@ public class VFSRootCPContainer extends AbstractVirtualContainer implements VFSC
String dir = container.getName();
if (path.startsWith("/" + dir + "/")) {
// remove virtual directory name from path to resolve from real container
- VFSItem item = container.resolve(path.substring(dir.length() + 1));
+ item = container.resolve(path.substring(dir.length() + 1));
if(item != null) {
return item;
}
--
GitLab