From 6b8bfc2e2d5dbbb0fae4ace23ea05ae5b524e46d Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Tue, 26 Feb 2013 01:13:31 +0600 Subject: [PATCH] Manually applies fix for U4-1776 SafeAlias culture problem since the files/class structure has changed in 6.1 --- src/Umbraco.Core/StringExtensions.cs | 8 ++++---- src/Umbraco.Core/Strings/LegacyShortStringHelper.cs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index cb693fce29..edf336463b 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -213,22 +213,22 @@ namespace Umbraco.Core public static string EnsureStartsWith(this string input, char value) { - return input.StartsWith(value.ToString()) ? input : value + input; + return input.StartsWith(value.ToString(CultureInfo.InvariantCulture)) ? input : value + input; } public static string EnsureEndsWith(this string input, char value) { - return input.EndsWith(value.ToString()) ? input : input + value; + return input.EndsWith(value.ToString(CultureInfo.InvariantCulture)) ? input : input + value; } public static bool IsLowerCase(this char ch) { - return ch.ToString(CultureInfo.InvariantCulture) == ch.ToString(CultureInfo.InvariantCulture).ToLower(); + return ch.ToString(CultureInfo.InvariantCulture) == ch.ToString(CultureInfo.InvariantCulture).ToLowerInvariant(); } public static bool IsUpperCase(this char ch) { - return ch.ToString(CultureInfo.InvariantCulture) == ch.ToString(CultureInfo.InvariantCulture).ToUpper(); + return ch.ToString(CultureInfo.InvariantCulture) == ch.ToString(CultureInfo.InvariantCulture).ToUpperInvariant(); } /// Is null or white space. diff --git a/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs b/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs index 380da70a4c..198b95185c 100644 --- a/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs @@ -277,7 +277,7 @@ function isValidAlias(alias) {{ { if (splittedPhraseChars.Length > 0) { - splittedPhraseChars[0] = ((new String(splittedPhraseChars[0], 1)).ToUpper().ToCharArray())[0]; + splittedPhraseChars[0] = ((new String(splittedPhraseChars[0], 1)).ToUpperInvariant().ToCharArray())[0]; } sb.Append(new String(splittedPhraseChars)); } @@ -292,15 +292,15 @@ function isValidAlias(alias) {{ var match = pattern.Match(result); if (match.Success) { - result = match.Groups[1].Value.ToLower() + match.Groups[2].Value; + result = match.Groups[1].Value.ToLowerInvariant() + match.Groups[2].Value; - return result.Substring(0, 1).ToLower() + result.Substring(1); + return result.Substring(0, 1).ToLowerInvariant() + result.Substring(1); } return result; } - return result.ToLower(); + return result.ToLowerInvariant(); } return result; @@ -361,7 +361,7 @@ function isValidAlias(alias) {{ Enumerable.Range(97, 26)); var sb = new StringBuilder(); - foreach (var c in value.Where(c => charReplacements.Values.Contains(c.ToString()) || validCodeRanges.Contains(c))) + foreach (var c in value.Where(c => charReplacements.Values.Contains(c.ToString(CultureInfo.InvariantCulture)) || validCodeRanges.Contains(c))) { sb.Append(c); }