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

Fix stuff from review

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-03-26 08:44:03 +01:00
parent 36827cfa9f
commit 64bae439bf
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web/Security/MembershipHelper.cs
View File

@@ -289,14 +289,14 @@ namespace Umbraco.Web.Security
return MemberCache.GetByProviderKey(key);
}
public virtual IEnumerable<IPublishedContent> GetByProviderKey(IEnumerable<object> keys)
public virtual IEnumerable<IPublishedContent> GetByProviderKeys(IEnumerable<object> keys)
{
return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
}
public virtual IEnumerable<IPublishedContent> GetByProviderKey(params object[] keys)
public virtual IEnumerable<IPublishedContent> GetByProviderKeys(params object[] keys)
{
return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
}
public virtual IPublishedContent GetById(int memberId)
@@ -304,14 +304,14 @@ namespace Umbraco.Web.Security
return MemberCache.GetById(memberId);
}
public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<int> memberIds)
public virtual IEnumerable<IPublishedContent> GetByIds(IEnumerable<int> memberIds)
{
return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
}
public virtual IEnumerable<IPublishedContent> GetById(params int[] memberIds)
public virtual IEnumerable<IPublishedContent> GetByIds(params int[] memberIds)
{
return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
}
public virtual IPublishedContent GetById(Guid memberId)
@@ -319,14 +319,14 @@ namespace Umbraco.Web.Security
return GetByProviderKey(memberId);
}
public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<Guid> memberIds)
public virtual IEnumerable<IPublishedContent> GetByIds(IEnumerable<Guid> memberIds)
{
return GetByProviderKey(memberIds.OfType<object>());
return GetByProviderKeys(memberIds.OfType<object>());
}
public virtual IEnumerable<IPublishedContent> GetById(params Guid[] memberIds)
public virtual IEnumerable<IPublishedContent> GetByIds(params Guid[] memberIds)
{
return GetByProviderKey(memberIds.OfType<object>());
return GetByProviderKeys(memberIds.OfType<object>());
}
public virtual IPublishedContent GetByUsername(string username)

6
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -291,7 +291,7 @@ namespace Umbraco.Web
public IEnumerable<IPublishedContent> Member(IEnumerable<int> ids)
{
return MembershipHelper.GetById(ids);
return MembershipHelper.GetByIds(ids);
}
public IEnumerable<IPublishedContent> Member(IEnumerable<string> ids)
@@ -301,7 +301,7 @@ namespace Umbraco.Web
public IEnumerable<IPublishedContent> Member(IEnumerable<Guid> ids)
{
return MembershipHelper.GetById(ids);
return MembershipHelper.GetByIds(ids);
}
public IEnumerable<IPublishedContent> Member(IEnumerable<Udi> ids)
@@ -326,7 +326,7 @@ namespace Umbraco.Web
public IEnumerable<IPublishedContent> Member(params Guid[] ids)
{
return MembershipHelper.GetById(ids);
return MembershipHelper.GetByIds(ids);
}
public IEnumerable<IPublishedContent> Member(params Udi[] ids)