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

Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
This commit is contained in:
Shannon
2014-03-13 14:12:02 +11:00
parent 62d4bff8aa 85a74e4fa7
commit b533a9f690
9 changed files with 138 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Controllers/UmbRegisterController.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Web.Controllers
return Redirect(model.RedirectUrl);
}
//redirect to current page by default
TempData.Add("FormSuccess", true);
TempData["FormSuccess"] = true;
return RedirectToCurrentUmbracoPage();
case MembershipCreateStatus.InvalidUserName:
ModelState.AddModelError((model.UsernameIsEmail || model.Username == null)