diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index 0bc2f993d7..5d7860026b 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -313,47 +313,15 @@ namespace Umbraco.Core.Services.Implement
ReplaceHtmlSymbols(ref newText);
}
-
- // make sure to only highlight changes done using TinyMCE editor... other changes will be displayed using default summary
- // TODO: We should probably allow more than just tinymce??
- if ((p.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.TinyMce)
- && string.CompareOrdinal(oldText, newText) != 0)
- {
- summary.Append("
");
- summary.Append("| Note: | ");
- summary.Append(
- " Red for deleted characters Yellow for inserted characters | ");
- summary.Append("
");
- summary.Append("");
- summary.Append("| New ");
- summary.Append(p.PropertyType.Name);
- summary.Append(" | ");
- summary.Append("");
- summary.Append(ReplaceLinks(CompareText(oldText, newText, true, false, "", string.Empty), siteUri));
- summary.Append(" | ");
- summary.Append("
");
- summary.Append("");
- summary.Append("| Old ");
- summary.Append(p.PropertyType.Name);
- summary.Append(" | ");
- summary.Append("");
- summary.Append(ReplaceLinks(CompareText(newText, oldText, true, false, "", string.Empty), siteUri));
- summary.Append(" | ");
- summary.Append("
");
- }
- else
- {
- summary.Append("");
- summary.Append("| ");
- summary.Append(p.PropertyType.Name);
- summary.Append(" | ");
- summary.Append("");
- summary.Append(newText);
- summary.Append(" | ");
- summary.Append("
");
- }
- summary.Append(
- "| |
");
+ //show the values
+ summary.Append("");
+ summary.Append("| ");
+ summary.Append(p.PropertyType.Name);
+ summary.Append(" | ");
+ summary.Append("");
+ summary.Append(newText);
+ summary.Append(" | ");
+ summary.Append("
");
}
var protocol = _globalSettings.UseHttps ? "https" : "http";
@@ -430,6 +398,7 @@ namespace Umbraco.Core.Services.Implement
/// The old string.
private static void ReplaceHtmlSymbols(ref string oldString)
{
+ if (oldString.IsNullOrWhiteSpace()) return;
oldString = oldString.Replace(" ", " ");
oldString = oldString.Replace("’", "'");
oldString = oldString.Replace("&", "&");
@@ -437,69 +406,7 @@ namespace Umbraco.Core.Services.Implement
oldString = oldString.Replace("”", "”");
oldString = oldString.Replace(""", "\"");
}
-
- ///
- /// Compares the text.
- ///
- /// The old text.
- /// The new text.
- /// if set to true [display inserted text].
- /// if set to true [display deleted text].
- /// The inserted style.
- /// The deleted style.
- ///
- private static string CompareText(string oldText, string newText, bool displayInsertedText,
- bool displayDeletedText, string insertedStyle, string deletedStyle)
- {
- var sb = new StringBuilder();
- var diffs = Diff.DiffText1(oldText, newText);
-
- int pos = 0;
- for (var n = 0; n < diffs.Length; n++)
- {
- var it = diffs[n];
-
- // write unchanged chars
- while ((pos < it.StartB) && (pos < newText.Length))
- {
- sb.Append(newText[pos]);
- pos++;
- } // while
-
- // write deleted chars
- if (displayDeletedText && it.DeletedA > 0)
- {
- sb.Append(deletedStyle);
- for (var m = 0; m < it.DeletedA; m++)
- {
- sb.Append(oldText[it.StartA + m]);
- } // for
- sb.Append("");
- }
-
- // write inserted chars
- if (displayInsertedText && pos < it.StartB + it.InsertedB)
- {
- sb.Append(insertedStyle);
- while (pos < it.StartB + it.InsertedB)
- {
- sb.Append(newText[pos]);
- pos++;
- } // while
- sb.Append("");
- } // if
- } // while
-
- // write rest of unchanged chars
- while (pos < newText.Length)
- {
- sb.Append(newText[pos]);
- pos++;
- } // while
-
- return sb.ToString();
- }
-
+
// manage notifications
// ideally, would need to use IBackgroundTasks - but they are not part of Core!