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

Replace uppercase chars to make behaviour consistent

Browse Source 
(cherry picked from commit 68cf801689)

# Conflicts:
#	src/Umbraco.Core/Extensions/RequestHandlerSettingsExtension.cs
This commit is contained in:
Bjarne Fyrstenborg
2022-08-16 21:31:51 +02:00
committed by Sebastiaan Janssen
parent 143fbef3d7
commit 68ff7b234d
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Extensions/RequestHandlerSettingsExtension.cs
View File

@@ -7,13 +7,13 @@ namespace Umbraco.Extensions;
/// <summary>
/// Get concatenated user and default character replacements
/// taking into account <see cref="RequestHandlerSettings.EnableDefaultCharReplacements" />
/// taking into account <see cref="RequestHandlerSettings.EnableDefaultCharReplacements" />.
/// </summary>
public static class RequestHandlerSettingsExtension
{
/// <summary>
/// Get concatenated user and default character replacements
/// taking into account <see cref="RequestHandlerSettings.EnableDefaultCharReplacements" />
/// taking into account <see cref="RequestHandlerSettings.EnableDefaultCharReplacements" />.
/// </summary>
public static IEnumerable<CharItem> GetCharReplacements(this RequestHandlerSettings requestHandlerSettings)
{
@@ -28,6 +28,7 @@ public static class RequestHandlerSettingsExtension
return RequestHandlerSettings.DefaultCharCollection;
}
/// Merges CharCollection and UserDefinedCharCollection, prioritizing UserDefinedCharCollection.
return MergeUnique(requestHandlerSettings.UserDefinedCharCollection, RequestHandlerSettings.DefaultCharCollection);
}
@@ -53,8 +54,7 @@ public static class RequestHandlerSettingsExtension
}
/// <summary>
/// Merges two IEnumerable of CharItem without any duplicates, items in priorityReplacements will override those in
/// alternativeReplacements
/// Merges two IEnumerable of CharItem without any duplicates, items in priorityReplacements will override those in alternativeReplacements.
/// </summary>
private static IEnumerable<CharItem> MergeUnique(
IEnumerable<CharItem> priorityReplacements,