Merge branch 'dev' into beta

3 files changed, 7 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
index 70cf805cf..91abbe34c 100644
--- a/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
@@ -49,8 +49,8 @@ namespace MediaBrowser.Server.Implementations.Sorting
 
         private int Compare(Episode x, Episode y)
         {
-            var isXSpecial = (x.PhysicalSeasonNumber ?? -1) == 0;
-            var isYSpecial = (y.PhysicalSeasonNumber ?? -1) == 0;
+            var isXSpecial = (x.ParentIndexNumber ?? -1) == 0;
+            var isYSpecial = (y.ParentIndexNumber ?? -1) == 0;
 
             if (isXSpecial && isYSpecial)
             {
@@ -74,7 +74,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
         {
             // http://thetvdb.com/wiki/index.php?title=Special_Episodes
 
-            var xSeason = x.PhysicalSeasonNumber ?? -1;
+            var xSeason = x.ParentIndexNumber ?? -1;
             var ySeason = y.AirsAfterSeasonNumber ?? y.AirsBeforeSeasonNumber ?? -1;
 
             if (xSeason != ySeason)
@@ -142,8 +142,8 @@ namespace MediaBrowser.Server.Implementations.Sorting
 
         private int CompareEpisodes(Episode x, Episode y)
         {
-            var xValue = (x.PhysicalSeasonNumber ?? -1) * 1000 + (x.IndexNumber ?? -1);
-            var yValue = (y.PhysicalSeasonNumber ?? -1) * 1000 + (y.IndexNumber ?? -1);
+            var xValue = (x.ParentIndexNumber ?? -1) * 1000 + (x.IndexNumber ?? -1);
+            var yValue = (y.ParentIndexNumber ?? -1) * 1000 + (y.IndexNumber ?? -1);
 
             return xValue.CompareTo(yValue);
         }
diff --git a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
index c881591be..3edf23020 100644
--- a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
         /// <returns>DateTime.</returns>
         private DateTime GetDate(BaseItem x)
         {
-            var userdata = UserDataRepository.GetUserData(User.Id, x.GetUserDataKey());
+            var userdata = UserDataRepository.GetUserData(User, x);
 
             if (userdata != null && userdata.LastPlayedDate.HasValue)
             {
diff --git a/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs b/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
index 1bc5261b4..8b14efffc 100644
--- a/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
         /// <returns>DateTime.</returns>
         private int GetValue(BaseItem x)
         {
-            var userdata = UserDataRepository.GetUserData(User.Id, x.GetUserDataKey());
+            var userdata = UserDataRepository.GetUserData(User, x);
 
             return userdata == null ? 0 : userdata.PlayCount;
         }