From 44493dca1d597f3cf9f8cf5db8d0ddda082c65e0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Jul 2013 13:18:32 -0400 Subject: add tvdb and games db to xml savers --- MediaBrowser.Controller/Entities/BaseItem.cs | 7 ++++++- MediaBrowser.Controller/Entities/Folder.cs | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Controller/Entities') diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index c89a7f0b2a..c0d681de20 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -992,8 +992,13 @@ namespace MediaBrowser.Controller.Entities return true; } - var rating = CustomRating ?? OfficialRating; + var rating = CustomRating; + if (string.IsNullOrEmpty(rating)) + { + rating = OfficialRating; + } + if (string.IsNullOrEmpty(rating)) { return !user.Configuration.BlockNotRated; diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index e46ec8d3b4..d1f2f87edb 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Progress; +using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; @@ -139,6 +140,11 @@ namespace MediaBrowser.Controller.Entities { get { + if (this is Series) + { + return base.OfficialRating; + } + return !string.IsNullOrEmpty(base.OfficialRating) ? base.OfficialRating : "None"; } set -- cgit v1.2.3