aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2014-10-08 18:47:01 -0400
committerWaqas Hussain <waqas20@gmail.com>2014-10-08 18:47:01 -0400
commite58a22fd47b0b0b50ae06527df8fa23f02e1c6a6 (patch)
tree01f86ba2dab7cddd087798294a180246a96e4c08
parenteab5feadd71d6a044ecfcc8131fd3b7ed350dc97 (diff)
parentcff85755634ad9c0ae431245e835625f5c57bb82 (diff)
downloadprosody-e58a22fd47b0b0b50ae06527df8fa23f02e1c6a6.tar.gz
prosody-e58a22fd47b0b0b50ae06527df8fa23f02e1c6a6.zip
Merge 0.10->trunk
-rw-r--r--util/dataforms.lua2
-rw-r--r--util/stanza.lua15
2 files changed, 14 insertions, 3 deletions
diff --git a/util/dataforms.lua b/util/dataforms.lua
index c352858c..b2988ae7 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -121,7 +121,7 @@ function form_t.data(layout, stanza)
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;
diff --git a/util/stanza.lua b/util/stanza.lua
index 82601e63..3d7caf8c 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -202,8 +202,19 @@ end
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