Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 14 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index f48a4430f..4c65fad68 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -31,9 +31,21 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public async Task<QueryResult<SearchHintInfo>> GetSearchHints(SearchQuery query)
         {
-            var user = _userManager.GetUserById(new Guid(query.UserId));
+            IEnumerable<BaseItem> inputItems;
 
-            var inputItems = user.RootFolder.GetRecursiveChildren(user, null).Where(i => !(i is ICollectionFolder));
+            if (string.IsNullOrEmpty(query.UserId))
+            {
+                inputItems = _libraryManager.RootFolder.RecursiveChildren;
+            }
+            else
+            {
+                var user = _userManager.GetUserById(new Guid(query.UserId));
+
+                inputItems = user.RootFolder.GetRecursiveChildren(user, null);
+            }
+
+
+            inputItems = inputItems.Where(i => !(i is ICollectionFolder));
 
             inputItems = _libraryManager.ReplaceVideosWithPrimaryVersions(inputItems);