Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
This commit is contained in:
Shannon
2013-08-13 18:22:45 +10:00
34 changed files with 376 additions and 117 deletions

View File

@@ -28,6 +28,16 @@ namespace Umbraco.Core
[UmbracoWillObsolete("Do not use this constants. See IShortStringHelper.CleanStringForSafeAliasJavaScriptCode.")]
public const string UmbracoInvalidFirstCharacters = "01234567890";
public static string ExceptChars(this string str, HashSet<char> toExclude)
{
var sb = new StringBuilder(str.Length);
foreach (var c in str.Where(c => toExclude.Contains(c) == false))
{
sb.Append(c);
}
return sb.ToString();
}
/// <summary>
/// Returns a stream from a string
/// </summary>