X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fcore%2Fluasrc%2Futil.lua;h=e285777c31960d383ece8fc64e9693963ad54020;hp=bde803f710612ad09512b7da36d41327111bd71b;hb=ce8a22d1b44029bff04450bebc86bab8591cb3be;hpb=f7b4fd2979e3a47c854638e4289883ba15e07705

diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index bde803f71..e285777c3 100644
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -182,27 +182,18 @@ end
 -- String and data manipulation routines
 --
 
---- Escapes all occurrences of the given character in given string.
--- @param s	String value containing unescaped characters
--- @param c	String value with character to escape (optional, defaults to "\")
--- @return	String value with each occurrence of character escaped with "\"
-function escape(s, c)
-	c = c or "\\"
-	return s:gsub(c, "\\" .. c)
-end
-
 --- Create valid XML PCDATA from given string.
 -- @param value	String value containing the data to escape
 -- @return		String value containing the escaped data
 function pcdata(value)
-	return value and tparser.sanitize_pcdata(tostring(value))
+	return value and tparser.pcdata(tostring(value))
 end
 
 --- Strip HTML tags from given string.
 -- @param value	String containing the HTML text
 -- @return	String with HTML tags stripped of
-function striptags(s)
-	return pcdata(tostring(s):gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " "))
+function striptags(value)
+	return value and tparser.striptags(tostring(value))
 end
 
 --- Splits given string on a defined separator sequence and return a table
@@ -356,7 +347,6 @@ function parse_units(ustr)
 end
 
 -- also register functions above in the central string class for convenience
-string.escape      = escape
 string.pcdata      = pcdata
 string.striptags   = striptags
 string.split       = split