diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/UserView.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs index ebd97e5c8..ef54626cc 100644 --- a/MediaBrowser.Controller/Entities/UserView.cs +++ b/MediaBrowser.Controller/Entities/UserView.cs @@ -132,11 +132,6 @@ namespace MediaBrowser.Controller.Entities CollectionType.Playlists }; - if (!ConfigurationManager.Configuration.EnableSharedCollectionViewImage) - { - standaloneTypes.Add(CollectionType.BoxSets); - } - var collectionFolder = folder as ICollectionFolder; if (collectionFolder == null) @@ -172,7 +167,9 @@ namespace MediaBrowser.Controller.Entities CollectionType.Books, CollectionType.MusicVideos, CollectionType.HomeVideos, - CollectionType.Photos + CollectionType.Photos, + CollectionType.Music, + CollectionType.BoxSets }; return types.Contains(viewType ?? string.Empty, StringComparer.OrdinalIgnoreCase); diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index d414ce7c1..89507a021 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -1954,14 +1954,14 @@ namespace MediaBrowser.Server.Implementations.Persistence if (query.TopParentIds.Length == 1) { - whereClauses.Add("(TopParentId is null or TopParentId=@TopParentId)"); + whereClauses.Add("(TopParentId=@TopParentId)"); cmd.Parameters.Add(cmd, "@TopParentId", DbType.String).Value = query.TopParentIds[0]; } if (query.TopParentIds.Length > 1) { var val = string.Join(",", query.TopParentIds.Select(i => "'" + i + "'").ToArray()); - whereClauses.Add("(TopParentId is null or TopParentId in (" + val + "))"); + whereClauses.Add("(TopParentId in (" + val + "))"); } if (query.AncestorIds.Length == 1) diff --git a/SharedVersion.cs b/SharedVersion.cs index ca05365bd..916cc79e3 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5781.2")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5781.2")] |