diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-31 15:28:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 15:28:03 -0400 |
| commit | 4e10daf646e0788409f2bc52ef70effa2616e3f3 (patch) | |
| tree | 72560ff07a80af5cffdfaadbf399e8b9cf46fc32 /MediaBrowser.Controller | |
| parent | 6c5fe7935b5c684526117de7472a6c34903aad44 (diff) | |
| parent | 5bfcbd4e9e07880a55cd88be031b523832186d93 (diff) | |
Merge pull request #2676 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvChannel.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Net/IHttpResultFactory.cs | 2 |
3 files changed, 14 insertions, 2 deletions
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> |