From a6c4ce3a31987e6bc23b78042b948a72c4bb5e51 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 19 Feb 2014 17:26:19 +1100 Subject: [PATCH] fixes some merge issues --- .../Persistence/Factories/MemberTypeReadOnlyFactory.cs | 2 +- .../umbraco/controls/GenericProperties/GenericProperty.ascx.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs index 53dca73f4d..230e2ec1dc 100644 --- a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs @@ -91,7 +91,7 @@ namespace Umbraco.Core.Persistence.Factories var tempGroupDto = groupDto; - var propertyType = new PropertyType(typeDto.ControlId, + var propertyType = new PropertyType(typeDto.PropertyEditorAlias, //ensures that any built-in membership properties have their correct dbtype assigned no matter //what the underlying data type is MemberTypeRepository.GetDbTypeForProperty(typeDto.Alias, typeDto.DbType.EnumParse(true))) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs index 7e9966a855..687508367f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs @@ -268,7 +268,6 @@ namespace umbraco.controls.GenericProperties { Delete(this,new EventArgs()); } - #endregion } }