handle overview stripping

3 files changed, 15 insertions, 5 deletions

diff --git a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
index 665911618..a6dab60b0 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
@@ -70,7 +71,7 @@ namespace MediaBrowser.Providers.Music
         private void ProcessResult(MusicArtist item, Artist result)
         {
             item.HomePageUrl = result.strWebsite;
-            item.Overview = result.strBiographyEN;
+            item.Overview = (result.strBiographyEN ?? string.Empty).StripHtml();
 
             if (!string.IsNullOrEmpty(result.strGenre))
             {
diff --git a/MediaBrowser.Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
index ea3525ba5..a2aa9d719 100644
--- a/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -103,7 +104,7 @@ namespace MediaBrowser.Providers.Music
                 Int32.TryParse(data.bio.yearformed, out yearFormed);
                 if (!artist.LockedFields.Contains(MetadataFields.Overview))
                 {
-                    artist.Overview = data.bio.content;
+                    artist.Overview = (data.bio.content ?? string.Empty).StripHtml();
                 }
                 if (!string.IsNullOrEmpty(data.bio.placeformed) && !artist.LockedFields.Contains(MetadataFields.ProductionLocations))
                 {
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 3ca70de16..dae0470cf 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -773,9 +773,17 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (fields.Contains(ItemFields.Overview))
             {
-                var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml();
+                // TODO: Remove this after a while, since it's been moved to the providers
+                if (item is MusicArtist)
+                {
+                    var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml();
 
-                dto.Overview = strippedOverview;
+                    dto.Overview = strippedOverview;
+                }
+                else
+                {
+                    dto.Overview = item.Overview;
+                }
             }
 
             // If there are no backdrops, indicate what parent has them in case the Ui wants to allow inheritance