yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up config for RequestHandler settings

Browse Source
This commit is contained in:
Bjarke Berg
2020-03-12 12:46:08 +01:00
parent e2dfc68718
commit e27a05c3e8
29 changed files with 135 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Core.Strings
public string DefaultCulture { get; set; } = ""; // invariant
public Dictionary<string, string> UrlReplaceCharacters { get; set; }
public DefaultShortStringHelperConfig WithConfig(Config config)
{
return WithConfig(DefaultCulture, CleanStringType.RoleMask, config);
@@ -57,16 +57,16 @@ namespace Umbraco.Core.Strings
/// Sets the default configuration.
/// </summary>
/// <returns>The short string helper.</returns>
public DefaultShortStringHelperConfig WithDefault(IUmbracoSettingsSection umbracoSettings)
public DefaultShortStringHelperConfig WithDefault(IRequestHandlerSettings requestHandlerSettings)
{
UrlReplaceCharacters = umbracoSettings.RequestHandler.CharCollection
UrlReplaceCharacters = requestHandlerSettings.CharCollection
.Where(x => string.IsNullOrEmpty(x.Char) == false)
.ToDictionary(x => x.Char, x => x.Replacement);
var urlSegmentConvertTo = CleanStringType.Utf8;
if (umbracoSettings.RequestHandler.ConvertUrlsToAscii)
if (requestHandlerSettings.ConvertUrlsToAscii)
urlSegmentConvertTo = CleanStringType.Ascii;
if (umbracoSettings.RequestHandler.TryConvertUrlsToAscii)
if (requestHandlerSettings.TryConvertUrlsToAscii)
urlSegmentConvertTo = CleanStringType.TryAscii;
return WithConfig(CleanStringType.UrlSegment, new Config