diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
| commit | cebfb0bf3e29df5aac96cb0d41adb8e356921dc8 (patch) | |
| tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /util/stanza.lua | |
| parent | f08fe049ef978fdaa00132f238d6f038605ed3a1 (diff) | |
| parent | 8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9 (diff) | |
| download | prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.tar.gz prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.zip | |
Merge 0.10->trunk
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 |