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

fixes some merge issues

Browse Source
This commit is contained in:
Shannon
2014-03-11 15:02:14 +11:00
parent 3c771648e3
commit 5dc44ca612
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
View File

@@ -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;

2
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -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);
}
/// <summary>