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

Merge pull request #2881 from skttl/patch-10

Browse Source 
U4-10029 Umbraco.ReplaceLineBreaksForHtml should return an IHtmlString
This commit is contained in:
Sebastiaan Janssen
2018-08-31 19:42:57 +02:00
committed by GitHub
parent 4a32eebb0b a6fd377f31
commit 075fcdc155
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/HtmlStringUtilities.cs
View File

@@ -20,9 +20,9 @@ namespace Umbraco.Web
/// </summary>
/// <param name="text">The text.</param>
/// <returns>The text with text line breaks replaced with html linebreaks (<br/>)</returns>
public string ReplaceLineBreaksForHtml(string text)
public HtmlString ReplaceLineBreaksForHtml(string text)
{
return text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />");
return new HtmlString(text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />"));
}
public HtmlString StripHtmlTags(string html, params string[] tags)

2
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -875,7 +875,7 @@ namespace Umbraco.Web
/// </summary>
/// <param name="text">The text.</param>
/// <returns>The text with text line breaks replaced with html linebreaks (<br/>)</returns>
public string ReplaceLineBreaksForHtml(string text)
public IHtmlString ReplaceLineBreaksForHtml(string text)
{
return StringUtilities.ReplaceLineBreaksForHtml(text);
}