Mercurial > prosody-hg

diff util/stanza.lua @ 6501:71b6e8b48a12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 26 Oct 2014 20:57:06 +0100
parents 3728c30da4e3 9030b056bd4a
children 5de6b93d0190
line wrap: on
line diff
--- a/util/stanza.lua	Sun Oct 26 16:29:50 2014 +0100
+++ b/util/stanza.lua	Sun Oct 26 20:57:06 2014 +0100
@@ -202,19 +202,8 @@
 
 local xml_escape
 do
-	local escape_table = {
-		["'"] = "&apos;";
-		['"'] = "&quot;";
-		["<"] = "&lt;";
-		[">"] = "&gt;";
-		["&"] = "&amp;";
-		-- escape this whitespace because [\r\n\t] change into spaces in attributes
-		-- and \r\n changes into \n in text, and we want to preserve original bytes
-		["\t"] = "&#x9;";
-		["\n"] = "&#xA;";
-		["\r"] = "&#xD;";
-	};
-	function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end
+	local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
+	function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
 	_M.xml_escape = xml_escape;
 end