paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 23:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Replaced 5 StringReplaces with one StringsReplace

Browse Source 
git-svn-id: trunk@17755 -
This commit is contained in:
joost 2011-06-14 19:23:05 +00:00
parent ce76ce8769
commit 092892ee82
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/fcl-xml/src/htmlelements.pp
View File

@ -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, '&', '&', [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 }