Merge pull request #1713 from MediaBrowser/dev

update components

1 files changed, 8 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 29db5fd55..a6894f515 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -170,7 +170,9 @@ namespace MediaBrowser.Controller.Entities.TV
             }
             else
             {
-                items = GetEpisodes(query.User).Where(filter);
+                items = query.Recursive
+                   ? GetRecursiveChildren(user, filter)
+                   : GetChildren(user, true).Where(filter);
             }
 
             var result = PostFilterAndSort(items, query);
@@ -267,6 +269,11 @@ namespace MediaBrowser.Controller.Entities.TV
             return GetEpisodes(user);
         }
 
+        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, Func<BaseItem, bool> filter)
+        {
+            return GetEpisodes(user).Where(filter);
+        }
+
         protected override bool GetBlockUnratedValue(UserPolicy config)
         {
             // Don't block. Let either the entire series rating or episode rating determine it