Merge pull request #2615 from MediaBrowser/dev

Dev

2 files changed, 1 insertions, 15 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 70512ef65..999f6db3f 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -84,6 +84,7 @@ namespace MediaBrowser.Controller.Entities
 
         public long? Size { get; set; }
         public string Container { get; set; }
+
         [IgnoreDataMember]
         public string Tagline { get; set; }
 
@@ -835,13 +836,6 @@ namespace MediaBrowser.Controller.Entities
         public float? CriticRating { get; set; }
 
         /// <summary>
-        /// Gets or sets the official rating description.
-        /// </summary>
-        /// <value>The official rating description.</value>
-        [IgnoreDataMember]
-        public string OfficialRatingDescription { get; set; }
-
-        /// <summary>
         /// Gets or sets the custom rating.
         /// </summary>
         /// <value>The custom rating.</value>
@@ -2291,11 +2285,6 @@ namespace MediaBrowser.Controller.Entities
                     ownedItem.CustomRating = item.CustomRating;
                     newOptions.ForceSave = true;
                 }
-                if (!string.Equals(item.OfficialRatingDescription, ownedItem.OfficialRatingDescription, StringComparison.Ordinal))
-                {
-                    ownedItem.OfficialRatingDescription = item.OfficialRatingDescription;
-                    newOptions.ForceSave = true;
-                }
             }
 
             return ownedItem.RefreshMetadata(newOptions, cancellationToken);
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index fb7748e13..092461c84 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -129,7 +129,6 @@ namespace MediaBrowser.Controller.Entities
         public string[] AncestorIds { get; set; }
         public string[] TopParentIds { get; set; }
 
-        public LocationType[] LocationTypes { get; set; }
         public string[] PresetViews { get; set; }
         public SourceType[] SourceTypes { get; set; }
         public SourceType[] ExcludeSourceTypes { get; set; }
@@ -176,7 +175,6 @@ namespace MediaBrowser.Controller.Entities
                 case ItemFields.DateCreated:
                 case ItemFields.SortName:
                 case ItemFields.Overview:
-                case ItemFields.OfficialRatingDescription:
                 case ItemFields.HomePageUrl:
                 case ItemFields.VoteCount:
                 case ItemFields.DisplayMediaType:
@@ -229,7 +227,6 @@ namespace MediaBrowser.Controller.Entities
             TopParentIds = new string[] { };
             ExcludeTags = new string[] { };
             ExcludeInheritedTags = new string[] { };
-            LocationTypes = new LocationType[] { };
             PresetViews = new string[] { };
             SourceTypes = new SourceType[] { };
             ExcludeSourceTypes = new SourceType[] { };