diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-23 12:56:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 12:56:50 -0400 |
| commit | 57bce7daf3777be0ab83833d140c3bb1b13766a8 (patch) | |
| tree | 9ed7509d17dc444ecd291b8253a2aa5e51aaae4b /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | de1b647d97c1f85078741251a8315f0b72a0d978 (diff) | |
| parent | 27c3acb2bfde9025c33f584c759a4038020cb702 (diff) | |
Merge pull request #2657 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index b18d47a65..f83b2f7bd 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -672,7 +672,7 @@ namespace MediaBrowser.Controller.Entities { return ItemRepository.GetItemList(new InternalItemsQuery { - ParentId = Id, + Parent = this, GroupByPresentationUniqueKey = false, DtoOptions = new DtoOptions(true) }); @@ -692,7 +692,7 @@ namespace MediaBrowser.Controller.Entities { Recursive = false, Limit = 0, - ParentId = Id, + Parent = this, DtoOptions = new DtoOptions(false) { EnableImages = false @@ -743,7 +743,10 @@ namespace MediaBrowser.Controller.Entities if (!(this is UserRootFolder) && !(this is AggregateFolder)) { - query.ParentId = query.ParentId ?? Id; + if (!query.ParentId.HasValue) + { + query.Parent = this; + } } if (RequiresPostFiltering2(query)) |