Merge pull request #10622 from ehmry/xml

Use standard XML escaping
2019-02-10 19:33:59 +01:00 · 2019-02-10 19:33:59 +01:00 · c5dc46926c
commit c5dc46926c
parent f0e6becc23 a9b2e83daa
1 changed files with 2 additions and 4 deletions
--- a/lib/pure/xmltree.nim
+++ b/lib/pure/xmltree.nim
@ -492,8 +492,7 @@ proc addEscaped*(result: var string, s: string) =
    of '>': result.add("&gt;")
    of '&': result.add("&amp;")
    of '"': result.add("&quot;")
-    of '\'': result.add("&#x27;")
-    of '/': result.add("&#x2F;")
+    of '\'': result.add("&apos;")
    else: result.add(c)

 proc escape*(s: string): string =
@ -508,8 +507,7 @@ proc escape*(s: string): string =
  ##  ``>``          ``&gt;``
  ##  ``&``          ``&amp;``
  ##  ``"``          ``&quot;``
-  ##  ``'``          ``&#x27;``
-  ##  ``/``          ``&#x2F;``
+  ##  ``'``          ``&apos;``
  ## ------------    -------------------
  ##
  ## You can also use `addEscaped proc <#addEscaped,string,string>`_.