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

Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
This commit is contained in:
Shannon
2013-09-11 13:07:22 +10:00
parent 105af392dc 4c5d6b5730
commit e75c050eff
187 changed files with 5903 additions and 1613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Models/DynamicPublishedContent.cs
View File

@@ -412,7 +412,7 @@ namespace Umbraco.Web.Models
return !attempt.Success
? null
: new PropertyResult(alias, attempt.Result, Guid.Empty, PropertyResultType.ReflectedProperty)
: new PropertyResult(alias, attempt.Result, PropertyResultType.ReflectedProperty)
{
DocumentTypeAlias = content.DocumentTypeAlias,
DocumentId = content.Id