diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:57:06 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:57:06 +0100 |
| commit | 29326acffa1d582bed7759e6302d2c4b4bced884 (patch) | |
| tree | c65d04b1647b92c2b09d1697a9c61d39485c1b09 /util/stanza.lua | |
| parent | d0cb0b35d5e1d3d12bf07610330c93e55eae086a (diff) | |
| parent | 5d050ae1e6ad245debbc3f644680c99dd50932c5 (diff) | |
| download | prosody-29326acffa1d582bed7759e6302d2c4b4bced884.tar.gz prosody-29326acffa1d582bed7759e6302d2c4b4bced884.zip | |
Merge 0.9->0.10
Diffstat (limited to 'util/stanza.lua')
| -rw-r--r-- | util/stanza.lua | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/util/stanza.lua b/util/stanza.lua index 3d7caf8c..82601e63 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -202,19 +202,8 @@ end local xml_escape do - local escape_table = { - ["'"] = "'"; - ['"'] = """; - ["<"] = "<"; - [">"] = ">"; - ["&"] = "&"; - -- 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"] = "	"; - ["\n"] = "
"; - ["\r"] = "
"; - }; - function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end + local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; + function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end _M.xml_escape = xml_escape; end |