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

Merge branch temp8 into temp8-U4-11227

Browse Source
This commit is contained in:
Stephan
2018-05-03 15:12:38 +02:00
parent a545c3c333 3495331005
commit b35d28c568
50 changed files with 317 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Services/Implement/MemberService.cs
View File

@@ -186,8 +186,9 @@ namespace Umbraco.Core.Services.Implement
/// <param name="email">Email of the <see cref="IMembershipUser"/> to create</param>
/// <param name="passwordValue">This value should be the encoded/encrypted/hashed value for the password that will be stored in the database</param>
/// <param name="memberTypeAlias">Alias of the Type</param>
/// <param name="isApproved"></param>
/// <returns><see cref="IMember"/></returns>
IMember IMembershipMemberService<IMember>.CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved = true)
IMember IMembershipMemberService<IMember>.CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved)
{
return CreateMemberWithIdentity(username, email, username, passwordValue, memberTypeAlias, isApproved);
}

4
src/Umbraco.Core/Services/Implement/UserService.cs
View File

@@ -198,7 +198,7 @@ namespace Umbraco.Core.Services.Implement
{
return _userRepository.GetByUsername(username, includeSecurityData: true);
}
catch (DbException ex)
catch (DbException)
{
// fixme - refactor users/upgrade
// currently kinda accepting anything on upgrade, but that won't deal with all cases
@@ -727,7 +727,7 @@ namespace Umbraco.Core.Services.Implement
{
return _userRepository.Get(id);
}
catch (DbException ex)
catch (DbException)
{
// fixme - refactor users/upgrade
// currently kinda accepting anything on upgrade, but that won't deal with all cases