libs/web: fix endian issues in lmo conversion leading to a bad index order

[project/luci.git] / libs / web / luasrc / cbi.lua

diff --git a/libs/web/luasrc/cbi.lua b/libs/web/luasrc/cbi.lua
index 88fb8a9..ae570b1 100644 (file)
--- a/libs/web/luasrc/cbi.lua
+++ b/libs/web/luasrc/cbi.lua
@@ -74,8 +74,6 @@ function load(cbimap, ...)
 
        assert(func, err)
 
-       luci.i18n.loadc("base")
-
        local env = {
                translate=i18n.translate,
                translatef=i18n.translatef,
@@ -180,8 +178,8 @@ function compile_datatype(code)
 
                                        if #label > 0 and tonumber(label) then
                                                stack[#stack+1] = tonumber(label)
-                                       elseif label:match("^'.+'$") or label:match('^".+"$') then
-                                               stack[#stack+1] = label:gsub("[\"'](.+)[\"']", "%1")
+                                       elseif label:match("^'.*'$") or label:match('^".*"$') then
+                                               stack[#stack+1] = label:gsub("[\"'](.*)[\"']", "%1")
                                        elseif type(datatypes[label]) == "function" then
                                                stack[#stack+1] = datatypes[label]
                                                stack[#stack+1] = { }
@@ -1432,13 +1430,11 @@ function AbstractValue.validate(self, value)
                        local v
                        for _, v in ipairs(value) do
                                if v and #v > 0 and not verify_datatype(self.datatype, v) then
-                                       error('F')
                                        return nil
                                end
                        end
                else
                        if not verify_datatype(self.datatype, value) then
-                               error('F')
                                return nil
                        end
                end