Merge pull request #1 from MediaBrowser/master

Update to latest

1 files changed, 9 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
index c58b9181b..b02c52874 100644
--- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -8,26 +8,28 @@ namespace MediaBrowser.Server.Implementations.Collections
         public ManualCollectionsFolder()
         {
             Name = "Collections";
+            DisplayMediaType = "CollectionFolder";
         }
 
         public override bool IsVisible(User user)
         {
-            if (!GetChildren(user, true).Any())
-            {
-                return false;
-            }
-
-            return base.IsVisible(user);
+            return GetChildren(user, true).Any() && 
+                base.IsVisible(user);
         }
 
         public override bool IsHidden
         {
             get
             {
-                return !ActualChildren.Any() || base.IsHidden;
+                return true;
             }
         }
 
+        public override bool IsHiddenFromUser(User user)
+        {
+            return !user.Configuration.DisplayCollectionsView;
+        }
+
         public override string CollectionType
         {
             get { return Model.Entities.CollectionType.BoxSets; }