Port 7.7 - WIP

This commit is contained in:
Stephan
2017-09-19 15:51:47 +02:00
parent d54658009c
commit 9ed6576908
126 changed files with 3447 additions and 596 deletions

View File

@@ -4,6 +4,7 @@ using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Web;
using System.Web.Mvc;
using Umbraco.Web.Composing;
using Umbraco.Web.Security;
namespace Umbraco.Web.Models
@@ -24,9 +25,9 @@ namespace Umbraco.Web.Models
private ProfileModel(bool doLookup)
{
MemberProperties = new List<UmbracoProperty>();
if (doLookup)
if (doLookup && Current.UmbracoContext != null)
{
var helper = new MembershipHelper(new HttpContextWrapper(HttpContext.Current));
var helper = new MembershipHelper(Current.UmbracoContext);
var model = helper.GetCurrentMemberProfileModel();
MemberProperties = model.MemberProperties;
}