starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-23 09:14:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into userdb-efcore

Browse Source 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
This commit is contained in:
Patrick Barron
2020-06-13 19:41:05 -04:00
parent e8f8307521 403cd3205f
commit 42b4f0aa2e
132 changed files with 197 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/Entities/UserView.cs
View File

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Jellyfin.Data.Entities;
using MediaBrowser.Controller.TV;
using MediaBrowser.Model.Querying;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.Controller.Entities
{
@@ -67,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);
}