Merge branch 'master' into buffer

1 files changed, 12 insertions, 10 deletions

diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 4ce9ec6f8..ceca77bc0 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -3,8 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.TV;
 using MediaBrowser.Model.Querying;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -66,7 +68,7 @@ namespace MediaBrowser.Controller.Entities
                 parent = LibraryManager.GetItemById(ParentId) as Folder ?? parent;
             }
 
-            return new UserViewBuilder(UserViewManager, LibraryManager, Logger, UserDataManager, TVSeriesManager, ConfigurationManager)
+            return new UserViewBuilder(UserViewManager, LibraryManager, LoggerFactory.CreateLogger<UserViewBuilder>(), UserDataManager, TVSeriesManager, ConfigurationManager)
                 .GetUserItems(parent, this, CollectionType, query);
         }
 
@@ -110,7 +112,7 @@ namespace MediaBrowser.Controller.Entities
 
         private static string[] UserSpecificViewTypes = new string[]
             {
-                MediaBrowser.Model.Entities.CollectionType.Playlists
+                Model.Entities.CollectionType.Playlists
             };
 
         public static bool IsUserSpecific(Folder folder)
@@ -139,8 +141,8 @@ namespace MediaBrowser.Controller.Entities
 
         private static string[] ViewTypesEligibleForGrouping = new string[]
             {
-                MediaBrowser.Model.Entities.CollectionType.Movies,
-                MediaBrowser.Model.Entities.CollectionType.TvShows,
+                Model.Entities.CollectionType.Movies,
+                Model.Entities.CollectionType.TvShows,
                 string.Empty
             };
 
@@ -151,12 +153,12 @@ namespace MediaBrowser.Controller.Entities
 
         private static string[] OriginalFolderViewTypes = new string[]
             {
-                MediaBrowser.Model.Entities.CollectionType.Books,
-                MediaBrowser.Model.Entities.CollectionType.MusicVideos,
-                MediaBrowser.Model.Entities.CollectionType.HomeVideos,
-                MediaBrowser.Model.Entities.CollectionType.Photos,
-                MediaBrowser.Model.Entities.CollectionType.Music,
-                MediaBrowser.Model.Entities.CollectionType.BoxSets
+                Model.Entities.CollectionType.Books,
+                Model.Entities.CollectionType.MusicVideos,
+                Model.Entities.CollectionType.HomeVideos,
+                Model.Entities.CollectionType.Photos,
+                Model.Entities.CollectionType.Music,
+                Model.Entities.CollectionType.BoxSets
             };
 
         public static bool EnableOriginalFolder(string viewType)