Daily merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-12 20:22:46 +00:00
parent 1250a0352c
commit 1dd2a7b72b
67 changed files with 1364 additions and 389 deletions

View File

@@ -470,7 +470,7 @@ public class CreateSpaceWizard extends BaseWizardBean
// add any configured content sub-types to the list
Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()).
getConfig("Custom Folder Types");
getConfig("Space Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
@@ -548,7 +548,7 @@ public class CreateSpaceWizard extends BaseWizardBean
}
else
{
logger.warn("Could not find 'Custom Folder Types' configuration section");
logger.warn("Could not find 'Space Wizards' configuration section");
}
}