From 5dc44ca6129a9b99bfcd1ecd21f159585fd3fca2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 11 Mar 2014 15:02:14 +1100 Subject: [PATCH] fixes some merge issues --- src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs | 6 +++--- src/Umbraco.Web/UmbracoHelper.cs | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs index 09437e2ddc..56a610eb04 100644 --- a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs +++ b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs @@ -41,9 +41,9 @@ namespace Umbraco.Tests.Membership var propertyTypes = new[] { // AutoPublishedContentType will auto-generate other properties - new PublishedPropertyType("title", 0, Guid.Empty), - new PublishedPropertyType("bodyText", 0, Guid.Empty), - new PublishedPropertyType("author", 0, Guid.Empty) + new PublishedPropertyType("title", 0, "?"), + new PublishedPropertyType("bodyText", 0, "?"), + new PublishedPropertyType("author", 0, "?") }; var type = new AutoPublishedContentType(0, "anything", propertyTypes); PublishedContentType.GetPublishedContentTypeCallback = (alias) => type; diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index ad8e02db11..57e3a9e377 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -80,6 +80,7 @@ namespace Umbraco.Web { if (content == null) throw new ArgumentNullException("content"); if (query == null) throw new ArgumentNullException("query"); + _membershipHelper = new MembershipHelper(_umbracoContext); _currentPage = content; _query = query; } @@ -118,6 +119,7 @@ namespace Umbraco.Web { if (query == null) throw new ArgumentNullException("query"); _query = query; + _membershipHelper = new MembershipHelper(_umbracoContext); } ///