Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts: src/Umbraco.Web/Controllers/UmbRegisterController.cs src/Umbraco.Web/Models/RegisterModel.cs
This commit is contained in:
@@ -23,12 +23,7 @@ namespace Umbraco.Web.Controllers
|
||||
|
||||
MembershipCreateStatus status;
|
||||
var member = Members.RegisterMember(model, out status, model.LoginOnSuccess);
|
||||
|
||||
// Save the password
|
||||
var memberService = Services.MemberService;
|
||||
var m = memberService.GetByUsername(member.UserName);
|
||||
memberService.SavePassword(m, model.Password);
|
||||
|
||||
|
||||
switch (status)
|
||||
{
|
||||
case MembershipCreateStatus.Success:
|
||||
|
||||
Reference in New Issue
Block a user