Merge pull request #7445 from Bond-009/baseitem

3 files changed, 1 insertions, 46 deletions

diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index 85a99d62c..94418683b 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -77,11 +77,6 @@ namespace MediaBrowser.Controller.Channels
             return false;
         }
 
-        protected override bool IsAllowTagFilterEnforced()
-        {
-            return false;
-        }
-
         internal static bool IsChannelVisible(BaseItem channelItem, User user)
         {
             var channel = ChannelManager.GetChannel(channelItem.ChannelId.ToString(string.Empty));
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index d993a15a9..2bb966d2c 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -878,10 +878,7 @@ namespace MediaBrowser.Controller.Entities
             return CanDownload() && IsAuthorizedToDownload(user);
         }
 
-        /// <summary>
-        /// Returns a <see cref="string" /> that represents this instance.
-        /// </summary>
-        /// <returns>A <see cref="string" /> that represents this instance.</returns>
+        /// <inheritdoc />
         public override string ToString()
         {
             return Name;
@@ -1595,23 +1592,6 @@ namespace MediaBrowser.Controller.Entities
             return value.Value <= maxAllowedRating.Value;
         }
 
-        public int? GetParentalRatingValue()
-        {
-            var rating = CustomRating;
-
-            if (string.IsNullOrEmpty(rating))
-            {
-                rating = OfficialRating;
-            }
-
-            if (string.IsNullOrEmpty(rating))
-            {
-                return null;
-            }
-
-            return LocalizationManager.GetRatingLevel(rating);
-        }
-
         public int? GetInheritedParentalRatingValue()
         {
             var rating = CustomRatingForComparison;
@@ -1652,11 +1632,6 @@ namespace MediaBrowser.Controller.Entities
             return true;
         }
 
-        protected virtual bool IsAllowTagFilterEnforced()
-        {
-            return true;
-        }
-
         public virtual UnratedItem GetBlockUnratedType()
         {
             if (SourceType == SourceType.Channel)
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index f9450ccb3..b6983b73e 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -189,21 +189,6 @@ namespace MediaBrowser.Controller.Entities
             return baseResult;
         }
 
-        protected override bool IsAllowTagFilterEnforced()
-        {
-            if (this is ICollectionFolder)
-            {
-                return false;
-            }
-
-            if (this is UserView)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
         /// <summary>
         /// Adds the child.
         /// </summary>