aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-14 22:28:32 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-14 22:28:32 -0400
commit5e994eabd5e30aacd3f9a90f548b167fe0e8f69b (patch)
treeacbb778ed9684c8cdb105625366e2e46ac819eb5
parent2f4f8c105e57c11c48a6c840e6f3cbb11538d82d (diff)
update other parental control option
-rw-r--r--MediaBrowser.Controller/Entities/InternalItemsQuery.cs2
-rw-r--r--MediaBrowser.Controller/Entities/PhotoAlbum.cs10
2 files changed, 2 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 092461c84..3c948487d 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -251,7 +251,7 @@ namespace MediaBrowser.Controller.Entities
if (policy.MaxParentalRating.HasValue)
{
- BlockUnratedItems = policy.BlockUnratedItems;
+ BlockUnratedItems = policy.BlockUnratedItems.Where(i => i != UnratedItem.Other).ToArray();
}
ExcludeInheritedTags = policy.BlockedTags;
diff --git a/MediaBrowser.Controller/Entities/PhotoAlbum.cs b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
index c902ac8cd..dd3cd98fb 100644
--- a/MediaBrowser.Controller/Entities/PhotoAlbum.cs
+++ b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
@@ -1,7 +1,4 @@
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Users;
-using System.Linq;
-using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Controller.Entities
{
@@ -24,10 +21,5 @@ namespace MediaBrowser.Controller.Entities
return false;
}
}
-
- protected override bool GetBlockUnratedValue(UserPolicy config)
- {
- return config.BlockUnratedItems.Contains(UnratedItem.Other);
- }
}
}