1 files changed, 17 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index a4be54f27..995a7fabd 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -2062,14 +2062,22 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
+        public List<PersonInfo> GetPeople(InternalPeopleQuery query)
+        {
+            return ItemRepository.GetPeople(query);
+        }
+
         public List<PersonInfo> GetPeople(BaseItem item)
         {
-            return item.People ?? ItemRepository.GetPeople(item.Id);
+            return item.People ?? GetPeople(new InternalPeopleQuery
+            {
+                ItemId = item.Id
+            });
         }
 
-        public List<Person> GetPeopleItems(BaseItem item)
+        public List<Person> GetPeopleItems(InternalPeopleQuery query)
         {
-            return ItemRepository.GetPeopleNames(item.Id).Select(i =>
+            return ItemRepository.GetPeopleNames(query).Select(i =>
             {
                 try
                 {
@@ -2084,11 +2092,14 @@ namespace MediaBrowser.Server.Implementations.Library
             }).Where(i => i != null).ToList();
         }
 
+        public List<string> GetPeopleNames(InternalPeopleQuery query)
+        {
+            return ItemRepository.GetPeopleNames(query);
+        }
+
         public List<PersonInfo> GetAllPeople()
         {
-            return RootFolder.GetRecursiveChildren()
-                .SelectMany(GetPeople)
-                .Where(i => !string.IsNullOrWhiteSpace(i.Name))
+            return GetPeople(new InternalPeopleQuery())
                 .DistinctBy(i => i.Name, StringComparer.OrdinalIgnoreCase)
                 .ToList();
         }