Skip to content

Commit

Permalink
Fixing regression in resource type configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
tHerrmann committed Dec 2, 2016
1 parent b60c243 commit 82959e1
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/org/opencms/ade/configuration/CmsResourceTypeConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,14 @@ public String getFolderPath(CmsObject cms, String pageFolderRootPath) {
if (m_folderOrName != null) {
return m_folderOrName.getFolderPath(cms, pageFolderRootPath);
} else {
return CmsStringUtil.joinPaths(
OpenCms.getSiteManager().getSiteRoot(pageFolderRootPath),
CmsADEManager.CONTENT_FOLDER_NAME,
m_typeName);
String siteRoot = null;
if (pageFolderRootPath != null) {
siteRoot = OpenCms.getSiteManager().getSiteRoot(pageFolderRootPath);
}
if (siteRoot == null) {
siteRoot = cms.getRequestContext().getSiteRoot();
}
return CmsStringUtil.joinPaths(siteRoot, CmsADEManager.CONTENT_FOLDER_NAME, m_typeName);
}
}

Expand Down

0 comments on commit 82959e1

Please sign in to comment.