aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-06-30 15:13:44 -0400
committerGitHub <noreply@github.com>2016-06-30 15:13:44 -0400
commit1f037779d73968877444497d60be6e483545228a (patch)
tree00a517d46cbcf1b427c7e4b5fb03e35bd4fecda3 /MediaBrowser.Server.Implementations
parent219c6464cdd49a11632fbea4cde265960819030c (diff)
parentb971fa9d5e7e1c5065b7982071326563b51c9878 (diff)
Merge pull request #1896 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
index ba6534a7c..b65c030f0 100644
--- a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
+++ b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
@@ -32,9 +32,7 @@ namespace MediaBrowser.Server.Implementations.TV
throw new ArgumentException("User not found");
}
- var parentIds = string.IsNullOrEmpty(request.ParentId)
- ? new string[] { }
- : new[] { request.ParentId };
+ var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
string presentationUniqueKey = null;
int? limit = null;
@@ -54,9 +52,11 @@ namespace MediaBrowser.Server.Implementations.TV
IncludeItemTypes = new[] { typeof(Series).Name },
SortOrder = SortOrder.Ascending,
PresentationUniqueKey = presentationUniqueKey,
- Limit = limit
+ Limit = limit,
+ ParentId = parentIdGuid,
+ Recursive = true
- }, parentIds).Cast<Series>();
+ }).Cast<Series>();
// Avoid implicitly captured closure
var episodes = GetNextUpEpisodes(request, user, items);