From 092892ee82d8e24e181155a31d20fb192f00a14f Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Tue, 14 Jun 2011 19:23:05 +0000
Subject: [PATCH]  * Replaced 5 StringReplaces with one StringsReplace

git-svn-id: trunk@17755 -
---
 packages/fcl-xml/src/htmlelements.pp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/fcl-xml/src/htmlelements.pp b/packages/fcl-xml/src/htmlelements.pp
index 5f0e5a25f3..06441fd246 100644
--- a/packages/fcl-xml/src/htmlelements.pp
+++ b/packages/fcl-xml/src/htmlelements.pp
@@ -18,7 +18,7 @@ unit htmlelements;
 interface
 
 uses
-  Classes, SysUtils, DOM, HtmlDefs;
+  Classes, SysUtils, DOM, HtmlDefs, strutils;
 
 type
 
@@ -135,22 +135,14 @@ implementation
 
 function EscapeHTML ( const S : String ) : String;
 begin
-  Result := StringReplace(s,      '&', '&amp;',  [rfReplaceAll]);
-  Result := StringReplace(Result, '<', '&lt;',   [rfReplaceAll]);
-  Result := StringReplace(Result, '>', '&gt;',   [rfReplaceAll]);
-  Result := StringReplace(Result, '"', '&quot;', [rfReplaceAll]);
-  Result := StringReplace(Result, #39, '&#39;',  [rfReplaceAll]); // ' - &apos; does not work on ie :(
+  // &apos; does not work on all versions of ie, so do not use it.
+  Result := StringsReplace(s,['&','<','>','"',#39],['&amp;','&lt;','&gt;','&quot;','&#39;'],[rfReplaceAll]);
 end;
 
 function UnescapeHTML ( const S : String ) : String;
 begin
-  Result := StringReplace(s,      '&lt;',   '<', [rfReplaceAll]);
-  Result := StringReplace(Result, '&gt;',   '>', [rfReplaceAll]);
-  Result := StringReplace(Result, '&quot;', '"', [rfReplaceAll]);
-  Result := StringReplace(Result, '&#39;',  #39, [rfReplaceAll]); // '
-  Result := StringReplace(Result, '&apos;', #39, [rfReplaceAll]); // '
-  Result := StringReplace(Result, '&amp;',  '&', [rfReplaceAll]);
-end; 
+  Result := StringsReplace(result,['&amp;','&lt;','&gt;','&quot;','&apos;','&#39;'],['&','<','>','"',#39,#39],[rfReplaceAll]);
+end;
 
 
 { THtmlCustomElement }