From da89c337a81e10cdd7a1d4258564a8b12caedcd9 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Tue, 12 Mar 2013 22:13:58 -0400 Subject: [PATCH] #22 - missing from last checkin --- MediaBrowser.Controller/Library/DtoBuilder.cs | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 51d1232807..04ebf3a8d1 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -293,17 +293,23 @@ namespace MediaBrowser.Controller.Library dto.Name = item.Name; dto.OfficialRating = item.OfficialRating; - var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml(); + var hasOverview = fields.Contains(ItemFields.Overview); + var hasHtmlOverview = fields.Contains(ItemFields.OverviewHtml); - if (fields.Contains(ItemFields.Overview)) + if (hasOverview || hasHtmlOverview) { - dto.Overview = strippedOverview; - } + var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml(); - // Only supply the html version if there was actually html content - if (fields.Contains(ItemFields.OverviewHtml) && !string.Equals(item.Overview, strippedOverview)) - { - dto.OverviewHtml = item.Overview; + if (fields.Contains(ItemFields.Overview)) + { + dto.Overview = strippedOverview; + } + + // Only supply the html version if there was actually html content + if (fields.Contains(ItemFields.OverviewHtml) && !string.Equals(item.Overview, strippedOverview)) + { + dto.OverviewHtml = item.Overview; + } } // If there are no backdrops, indicate what parent has them in case the Ui wants to allow inheritance