Index: src/main/java/info/magnolia/module/fckeditor/pages/RepositoryBrowserPage.java =================================================================== --- src/main/java/info/magnolia/module/fckeditor/pages/RepositoryBrowserPage.java (revision 38373) +++ src/main/java/info/magnolia/module/fckeditor/pages/RepositoryBrowserPage.java (working copy) @@ -34,6 +34,7 @@ package info.magnolia.module.fckeditor.pages; import info.magnolia.cms.beans.config.URI2RepositoryManager; +import info.magnolia.context.MgnlContext; import info.magnolia.module.ModuleRegistry; import info.magnolia.module.admininterface.InvalidTreeHandlerException; import info.magnolia.module.admininterface.TemplatedMVCHandler; @@ -84,7 +85,7 @@ final String absoluteURI = manager.getURI(repoName, getSelectedPath()); - setAbsoluteURI(absoluteURI); + setAbsoluteURI(MgnlContext.getContextPath() + absoluteURI); } else { setAbsoluteURI(StringUtils.EMPTY); } @@ -96,8 +97,9 @@ final URI2RepositoryManager manager = URI2RepositoryManager.getInstance(); if (StringUtils.isNotEmpty(absoluteURI)) { - final String repository = manager.getRepository(absoluteURI); - final String path = manager.getHandle(absoluteURI); + String absoluteURIWithoutContextPath = StringUtils.removeStart(absoluteURI, MgnlContext.getContextPath()); + final String repository = manager.getRepository(absoluteURIWithoutContextPath); + final String path = manager.getHandle(absoluteURIWithoutContextPath); setSelectedRepository(repository); setSelectedPath(path); Index: src/main/resources/mgnl-resources/fckeditor/custom/config/magnoliaStandard.js =================================================================== --- src/main/resources/mgnl-resources/fckeditor/custom/config/magnoliaStandard.js (revision 38373) +++ src/main/resources/mgnl-resources/fckeditor/custom/config/magnoliaStandard.js (working copy) @@ -113,7 +113,8 @@ FCKConfig.LinkBrowser = true; FCKConfig.LinkBrowserURL = MgnlFCKConfig.contextPath + "/.magnolia/pages/repositoryBrowser.html?contextPath=" + MgnlFCKConfig.contextPath; -FCKConfig.ImageBrowser = false; +FCKConfig.ImageBrowser = true; +FCKConfig.ImageBrowserURL = MgnlFCKConfig.contextPath + "/.magnolia/pages/repositoryBrowser.html?contextPath=" + MgnlFCKConfig.contextPath; FCKConfig.FlashBrowser = false;