Merge origin/dev-v7-deploy into dev-v8-zbwip

This commit is contained in:
Stephan
2016-11-04 18:40:42 +01:00
64 changed files with 6702 additions and 803 deletions

View File

@@ -215,6 +215,13 @@ namespace Umbraco.Web
if (!lengthReached && currentTextLength >= length)
{
// if the last character added was the first of a two character unicode pair, add the second character
if (Char.IsHighSurrogate((char)ic))
{
var lowSurrogate = tr.Read();
outputtw.Write((char)lowSurrogate);
}
// Reached truncate limit.
if (addElipsis)
{