diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-05-08 09:39:48 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-05-08 09:39:48 -0400 |
| commit | 41b7787c63ed47d61af8b13d6f8ed8d8463ef8c6 (patch) | |
| tree | 0a0ad3acd096065a3406bcc06e906f107eda63b6 /MediaBrowser.Server.Implementations/Library | |
| parent | 16c219b018ac536788cc93d2ec013475ae52abdb (diff) | |
| parent | fb25ac7c087be0808677f431023f0769a69c76d2 (diff) | |
Merge pull request #1717 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/UserDataManager.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index b6a33afe4..f9bf3446f 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1398,7 +1398,7 @@ namespace MediaBrowser.Server.Implementations.Library private void AddUserToQuery(InternalItemsQuery query, User user) { - if (query.AncestorIds.Length == 0 && !query.ParentId.HasValue && query.ChannelIds.Length == 0 && query.TopParentIds.Length == 0) + if (query.AncestorIds.Length == 0 && !query.ParentId.HasValue && query.ChannelIds.Length == 0 && query.TopParentIds.Length == 0 && string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey)) { var userViews = _userviewManager().GetUserViews(new UserViewQuery { diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs index 98f8abd40..d3aad20f5 100644 --- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs @@ -157,7 +157,7 @@ namespace MediaBrowser.Server.Implementations.Library return _userData.GetOrAdd(GetCacheKey(userId, key), keyName => GetUserDataFromRepository(userId, key)); } - public UserItemData GetUserDataFromRepository(Guid userId, string key) + private UserItemData GetUserDataFromRepository(Guid userId, string key) { var data = Repository.GetUserData(userId, key); |
