Fixed issue DevExpress#568 (DevExpress#568)

mmarjano · May 12, 2021 · 4bea14b · 4bea14b
1 parent d3ad8d0
commit 4bea14b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/AjaxControlToolkit/HtmlEditorExtender/HtmlEditorExtender.cs b/AjaxControlToolkit/HtmlEditorExtender/HtmlEditorExtender.cs
@@ -168,8 +168,8 @@ public string Decode(string value) {
             var hrefCharacters = "^\\\"\\>\\<\\\\";
             result = Regex.Replace(result, "(?:\\&lt\\;|\\<)(\\/?)(a(?:(?:\\shref\\=\\\"[" + hrefCharacters + "]*\\\")|(?:\\sstyle\\=\\\"[" + attributeCharacters + "]*\\\"))*)(?:\\&gt\\;|\\>)", "<$1$2>", RegexOptions.IgnoreCase | RegexOptions.ECMAScript);
 
-            result = Regex.Replace(result, "&?lt;", "<");
-            result = Regex.Replace(result, "&?gt;", ">");
+            result = Regex.Replace(result, "&lt;", "<");
+            result = Regex.Replace(result, "&gt;", ">");
 
             result = Regex.Replace(result, "&amp;", "&", RegexOptions.IgnoreCase);
             result = Regex.Replace(result, "&nbsp;", "\xA0", RegexOptions.IgnoreCase);

diff --git a/AjaxControlToolkit/Scripts/HtmlEditorExtender.js b/AjaxControlToolkit/Scripts/HtmlEditorExtender.js
@@ -868,7 +868,7 @@ Sys.Extended.UI.HtmlEditorExtenderBehavior.prototype = {
         html = html.replace(/\<(\/?)strong\>/gi, '<$1b>').replace(/\<(\/?)em\>/gi, '<$1i>');
 
         //encode for safe transport
-        html = html.replace(/&(?!g|lt;)/ig, '&amp;').replace(/\xA0/ig, '&nbsp;');
+        html = html.replace(/&/ig, '&amp;').replace(/\xA0/ig, '&nbsp;');
         html = html.replace(/</ig, '&lt;').replace(/>/ig, '&gt;').replace(/\'/ig, '&apos;').replace(/\"/ig, '&quot;');
 
         return html;