Merge pull request #2614 from MediaBrowser/dev

Dev

5 files changed, 4 insertions, 15 deletions

diff --git a/MediaBrowser.Controller/Entities/AudioBook.cs b/MediaBrowser.Controller/Entities/AudioBook.cs
index 8b1c338f1..1bdcfb881 100644
--- a/MediaBrowser.Controller/Entities/AudioBook.cs
+++ b/MediaBrowser.Controller/Entities/AudioBook.cs
@@ -31,12 +31,10 @@ namespace MediaBrowser.Controller.Entities
         public string SeriesName { get; set; }
         [IgnoreDataMember]
         public Guid? SeriesId { get; set; }
-        [IgnoreDataMember]
-        public string SeriesSortName { get; set; }
 
         public string FindSeriesSortName()
         {
-            return SeriesSortName;
+            return SeriesName;
         }
         public string FindSeriesName()
         {
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs
index a6da389f0..7cb242589 100644
--- a/MediaBrowser.Controller/Entities/Book.cs
+++ b/MediaBrowser.Controller/Entities/Book.cs
@@ -24,12 +24,10 @@ namespace MediaBrowser.Controller.Entities
         public string SeriesName { get; set; }
         [IgnoreDataMember]
         public Guid? SeriesId { get; set; }
-        [IgnoreDataMember]
-        public string SeriesSortName { get; set; }
 
         public string FindSeriesSortName()
         {
-            return SeriesSortName;
+            return SeriesName;
         }
         public string FindSeriesName()
         {
diff --git a/MediaBrowser.Controller/Entities/IHasSeries.cs b/MediaBrowser.Controller/Entities/IHasSeries.cs
index 203be93e8..20efdc2b8 100644
--- a/MediaBrowser.Controller/Entities/IHasSeries.cs
+++ b/MediaBrowser.Controller/Entities/IHasSeries.cs
@@ -11,7 +11,6 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The name of the series.</value>
         string SeriesName { get; set; }
         string FindSeriesName();
-        string SeriesSortName { get; set; }
         string FindSeriesSortName();
         Guid? SeriesId { get; set; }
         Guid? FindSeriesId();
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 31bf8d28b..c2f7a6168 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -57,13 +57,10 @@ namespace MediaBrowser.Controller.Entities.TV
         /// <value>The index number.</value>
         public int? IndexNumberEnd { get; set; }

 

-        [IgnoreDataMember]

-        public string SeriesSortName { get; set; }

-

         public string FindSeriesSortName()

         {

             var series = Series;

-            return series == null ? SeriesSortName : series.SortName;

+            return series == null ? SeriesName : series.SortName;

         }

 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 6c97a32a0..ed04b5ddc 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -51,9 +51,6 @@ namespace MediaBrowser.Controller.Entities.TV
             get { return SeriesId; }
         }
 
-        [IgnoreDataMember]
-        public string SeriesSortName { get; set; }
-
         public override double? GetDefaultPrimaryImageAspectRatio()
         {
             double value = 2;
@@ -65,7 +62,7 @@ namespace MediaBrowser.Controller.Entities.TV
         public string FindSeriesSortName()
         {
             var series = Series;
-            return series == null ? SeriesSortName : series.SortName;
+            return series == null ? SeriesName : series.SortName;
         }
 
         // Genre, Rating and Stuido will all be the same