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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10074-fix-createmember-and-createcontent

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
This commit is contained in:
Bjarke Berg
2021-02-25 08:10:52 +01:00
parent 1399fbabe4 23f2b091ad
commit 0c5a1fb648
3567 changed files with 19631 additions and 22865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
View File

@@ -2,17 +2,16 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Persistence.Querying;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Scoping;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Persistence.Querying;
using Umbraco.Cms.Core.Persistence.Repositories;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Infrastructure.Persistence.Querying;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.Services.Implement
namespace Umbraco.Cms.Core.Services.Implement
{
/// <summary>
/// Represents the MemberService.
@@ -904,7 +903,7 @@ namespace Umbraco.Infrastructure.Services.Implement
using (IScope scope = ScopeProvider.CreateScope(autoComplete: true))
{
scope.ReadLock(Constants.Locks.MemberTree);
return _memberGroupRepository.GetMany().Select(x=>x).Distinct();
return _memberGroupRepository.GetMany().Distinct();
}
}