Merge r4115 r4118

This commit is contained in:
Jo-Philipp Wich 2009-01-25 13:14:29 +00:00
parent 13f51f1521
commit fbd63dafcc

View file

@ -193,16 +193,25 @@ end
--- Create valid XML PCDATA from given string. --- Create valid XML PCDATA from given string.
-- @param value String value containing the data to escape -- @param value String value containing the data to escape
-- @return String value containing the escaped data -- @return String value containing the escaped data
local _pcdata_repl = { local function _pcdata_repl(c)
["&"] = "&", local i = string.byte(c)
['"'] = """,
["'"] = "&#39;", if ( i >= 0x00 and i <= 0x08 ) or ( i >= 0x0B and i <= 0x0C ) or
["<"] = "&#60;", ( i >= 0x0E and i <= 0x1F ) or ( i == 0x7F )
[">"] = "&#62;" then
} return ""
elseif ( i == 0x26 ) or ( i == 0x27 ) or ( i == 0x22 ) or
( i == 0x3C ) or ( i == 0x3E )
then
return string.format("&#%i;", i)
end
return c
end
function pcdata(value) function pcdata(value)
return value and tostring(value):gsub("[&\"'<>]", _pcdata_repl) return value and tostring(value):gsub("[&\"'<>%c]", _pcdata_repl)
end end
--- Strip HTML tags from given string. --- Strip HTML tags from given string.