More luci.util optimizations

diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index c84df1a170f46f41d04cc1c8ac0cff72ed2cccd0..95491cfee043a30bef4941bd648a4481e3ece88d 100644 (file)
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -194,13 +194,13 @@ end
 -- @param value        String value containing the data to escape
 -- @return             String value containing the escaped data
 function pcdata(value)
-       if not value then return end
-       value = tostring(value)
-       value = value:gsub("&", "&")
-       value = value:gsub('"', """)
-       value = value:gsub("'", "'")
-       value = value:gsub("<", "&lt;")
-       return value:gsub(">", "&gt;")
+       return value and tostring(value):gsub("[&\"'<>]", {
+               ["&"] = "&amp;",
+               ['"'] = "&quot;",
+               ["'"] = "&apos;",
+               ["<"] = "&lt;",
+               [">"] = "&gt;"
+       })
 end
 
 --- Strip HTML tags from given string.
@@ -567,13 +567,12 @@ function _sortiter( t, f )
        end
 
        local _pos = 0
-       local _len = table.getn( keys )
 
        table.sort( keys, f )
 
        return function()
                _pos = _pos + 1
-               if _pos <= _len then
+               if _pos <= #keys then
                        return keys[_pos], t[keys[_pos]]
                end
        end