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

Ensure U4-8720 is properly merged into v8

Browse Source
This commit is contained in:
Stephan
2016-11-05 12:22:57 +01:00
parent 467ed87c3b
commit 8aa730d986
10 changed files with 179 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/PublishedContentQuery.cs
View File

@@ -110,6 +110,13 @@ namespace Umbraco.Web
: _query.Media(id);
}
public IPublishedContent Media(Guid id)
{
return _query == null
? ItemById(id, _mediaCache)
: _query.Media(id);
}
public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
{
return _query == null
@@ -117,6 +124,13 @@ namespace Umbraco.Web
: _query.Media(ids);
}
public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
{
return _query == null
? ItemsByIds(_mediaCache, ids)
: _query.Media(ids);
}
public IEnumerable<IPublishedContent> MediaAtRoot()
{
return _query == null