Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

This commit is contained in:
Shannon
2013-12-19 11:06:11 +11:00

View File

@@ -585,11 +585,11 @@ function validateSafeAlias(id, value, immediate, callback) {{
if (isPair) if (isPair)
throw new NotSupportedException("Surrogate pairs are not supported."); throw new NotSupportedException("Surrogate pairs are not supported.");
Console.WriteLine("CHAR '{0}' {1} {2} - {3} - {4}/{5} {6}", //Console.WriteLine("CHAR '{0}' {1} {2} - {3} - {4}/{5} {6}",
c, // c,
isTerm ? "term" : "!term", isUpper ? "upper" : "!upper", // isTerm ? "term" : "!term", isUpper ? "upper" : "!upper",
state, // state,
i, ipos, leading ? "leading" : "!leading"); // i, ipos, leading ? "leading" : "!leading");
switch (state) switch (state)
{ {
@@ -697,10 +697,10 @@ function validateSafeAlias(id, value, immediate, callback) {{
CleanStringType caseType, CultureInfo culture, bool isAcronym) CleanStringType caseType, CultureInfo culture, bool isAcronym)
{ {
var term = input.Substring(ipos, len); var term = input.Substring(ipos, len);
Console.WriteLine("TERM \"{0}\" {1} {2}", //Console.WriteLine("TERM \"{0}\" {1} {2}",
term, // term,
isAcronym ? "acronym" : "word", // isAcronym ? "acronym" : "word",
caseType); // caseType);
if (isAcronym) if (isAcronym)
{ {