Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 20 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 10b3aa7228..ac8688f77e 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1072,6 +1072,11 @@ namespace MediaBrowser.Controller.Entities
                 return true;
             }
 
+            if (user.Configuration.BlockNotRated && string.IsNullOrEmpty(CustomRating ?? OfficialRating))
+            {
+                return false;
+            }
+
             return Ratings.Level(CustomRating ?? OfficialRating) <= user.Configuration.MaxParentalRating.Value;
         }
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index b327756559..2033130937 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -121,6 +121,21 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <summary>
+        /// Never want folders to be blocked by "BlockNotRated"
+        /// </summary>
+        public override string OfficialRating
+        {
+            get
+            {
+                return !string.IsNullOrEmpty(base.OfficialRating) ? base.OfficialRating : "None";
+            }
+            set
+            {
+                base.OfficialRating = value;
+            }
+        }
+
+        /// <summary>
         /// Removes the child.
         /// </summary>
         /// <param name="item">The item.</param>