yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 7.4.0 into dev-v7-deploy

Browse Source
This commit is contained in:
Stephan
2015-12-03 12:57:15 +01:00
parent 3e8ba73af2 22eea2b7db
commit d3faf1d10a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Models/Mapping/ContentTypeModelMapperExtensions.cs
View File

@@ -121,6 +121,8 @@ namespace Umbraco.Web.Models.Mapping
//ignore, we'll do this in after map
.ForMember(dto => dto.PropertyGroups, expression => expression.Ignore())
.ForMember(dto => dto.NoGroupPropertyTypes, expression => expression.Ignore())
// ignore, composition is managed in AfterMapContentTypeSaveToEntity
.ForMember(dest => dest.ContentTypeComposition, opt => opt.Ignore())
.ForMember(
dto => dto.AllowedContentTypes,

15
src/UmbracoExamine/BaseUmbracoIndexer.cs
View File

@@ -460,8 +460,19 @@ namespace UmbracoExamine
if (xDoc != null)
{
var rootNode = xDoc.Root;
AddNodesToIndex(rootNode.Elements(), type);
if (rootNode != null)
{
//the result will either be a single doc with an id as the root, or it will
// be multiple docs with a <nodes> wrapper, we need to check for this
if (rootNode.HasAttributes)
{
AddNodesToIndex(new[] {rootNode}, type);
}
else
{
AddNodesToIndex(rootNode.Elements(), type);
}
}
}
}