projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libs/web: remove debugging code
[project/luci.git]
/
libs
/
web
/
luasrc
/
cbi.lua
diff --git
a/libs/web/luasrc/cbi.lua
b/libs/web/luasrc/cbi.lua
index
88fb8a9
..
ef45a89
100644
(file)
--- a/
libs/web/luasrc/cbi.lua
+++ b/
libs/web/luasrc/cbi.lua
@@
-180,8
+180,8
@@
function compile_datatype(code)
if #label > 0 and tonumber(label) then
stack[#stack+1] = tonumber(label)
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] = { }
elseif type(datatypes[label]) == "function" then
stack[#stack+1] = datatypes[label]
stack[#stack+1] = { }
@@
-1432,13
+1432,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
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
return nil
end
end
else
if not verify_datatype(self.datatype, value) then
- error('F')
return nil
end
end
return nil
end
end