prosody
3728c30da4e3

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

6468:3728c30da4e3

Merge 0.9->0.10
author Waqas Hussain <waqas20@gmail.com>
date Wed, 08 Oct 2014 18:42:33 -0400
parents 6464:737c81bd898e (current diff) 6467:77d00a895bbd (diff)
children 6469:93ffe59a9546 6470:67501b5576d3
files util/dataforms.lua util/stanza.lua
diffstat 2 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/util/dataforms.lua	Sun Oct 05 15:37:21 2014 +0200
+++ b/util/dataforms.lua	Wed Oct 08 18:42:33 2014 -0400
@@ -121,7 +121,7 @@
 
 	for _, field in ipairs(layout) do
 		local tag;
-		for field_tag in stanza:childtags() do
+		for field_tag in stanza:childtags("field") do
 			if field.name == field_tag.attr.var then
 				tag = field_tag;
 				break;
--- a/util/stanza.lua	Sun Oct 05 15:37:21 2014 +0200
+++ b/util/stanza.lua	Wed Oct 08 18:42:33 2014 -0400
@@ -202,8 +202,19 @@
 
 local xml_escape
 do
-	local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
-	function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
+	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
 	_M.xml_escape = xml_escape;
 end