From 5bfcbd4e9e07880a55cd88be031b523832186d93 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 31 May 2017 15:21:32 -0400
Subject: update dlna profiles

---
 MediaBrowser.Controller/Entities/BaseItem.cs      | 12 +++++++++++-
 MediaBrowser.Controller/LiveTv/LiveTvChannel.cs   |  2 +-
 MediaBrowser.Controller/Net/IHttpResultFactory.cs |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 3d46cc9aa..346442f59 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -655,7 +655,17 @@ namespace MediaBrowser.Controller.Entities
 
         private string CreateSortNameFromCustomValue(string value)
         {
-            return string.IsNullOrWhiteSpace(value) ? null : ModifySortChunks(value).ToLower();
+            return string.IsNullOrWhiteSpace(value) ? null : NormalizeCustomSortName(value);
+        }
+
+        protected virtual string NormalizeCustomSortName(string value)
+        {
+            if (ConfigurationManager.Configuration.EnableSimpleSortNameHandling)
+            {
+                return value.RemoveDiacritics().ToLower();
+            }
+
+            return ModifySortChunks(value).ToLower();
         }
 
         public bool IsSortNameDefault(string value)
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
index 8a10ae417..34a9103f8 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
@@ -101,7 +101,7 @@ namespace MediaBrowser.Controller.LiveTv
                 }
             }
 
-            return Number + "-" + (Name ?? string.Empty);
+            return (Number ?? string.Empty) + "-" + (Name ?? string.Empty);
         }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Net/IHttpResultFactory.cs b/MediaBrowser.Controller/Net/IHttpResultFactory.cs
index 7b431f69a..b88524691 100644
--- a/MediaBrowser.Controller/Net/IHttpResultFactory.cs
+++ b/MediaBrowser.Controller/Net/IHttpResultFactory.cs
@@ -22,6 +22,8 @@ namespace MediaBrowser.Controller.Net
         /// <returns>System.Object.</returns>
         object GetResult(object content, string contentType, IDictionary<string,string> responseHeaders = null);
 
+        object GetRedirectResult(string url);
+
         /// <summary>
         /// Gets the optimized result.
         /// </summary>
-- 
cgit v1.2.3