From fc18189fc8cd9b402314da8217914d0c6b4a6fad Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 9 Jan 2014 13:32:39 +1100 Subject: [PATCH] fixes a null check on membership provider, completes: U4-3962 publicize IMapperConfiguration --- src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs | 2 +- src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs | 2 +- src/umbraco.providers/members/UmbracoMembershipProvider.cs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs b/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs index 4864c4bba4..f9c0c2cc1e 100644 --- a/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs +++ b/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs @@ -15,7 +15,7 @@ namespace Umbraco.Core.Models.Mapping /// All automapper configurations are done during startup /// inside an Automapper Initialize call which is better for performance /// - internal interface IMapperConfiguration : IApplicationEventHandler + public interface IMapperConfiguration : IApplicationEventHandler { void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext); } diff --git a/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs b/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs index 1e88e648cf..52683231e2 100644 --- a/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs +++ b/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Models.Mapping /// /// Use this class if your mapper configuration isn't also explicitly an ApplicationEventHandler. /// - internal abstract class MapperConfiguration : ApplicationEventHandler, IMapperConfiguration + public abstract class MapperConfiguration : ApplicationEventHandler, IMapperConfiguration { public abstract void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext); } diff --git a/src/umbraco.providers/members/UmbracoMembershipProvider.cs b/src/umbraco.providers/members/UmbracoMembershipProvider.cs index 4e2021e5c8..35cc2607de 100644 --- a/src/umbraco.providers/members/UmbracoMembershipProvider.cs +++ b/src/umbraco.providers/members/UmbracoMembershipProvider.cs @@ -782,7 +782,8 @@ namespace umbraco.providers.members { if (string.IsNullOrEmpty(propertyTypeAlias) == false) { - if (m.Properties[propertyTypeAlias] != null && + if (m.Properties.Contains(propertyTypeAlias) && + m.Properties[propertyTypeAlias] != null && m.Properties[propertyTypeAlias].Value != null) { if (isBool)