From d12dfa5186f83fdb25ddbadfe2077f40115ce820 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 14 Jul 2008 17:37:37 +0000 Subject: [PATCH] libs/cbi: Fixed MultiValues --- libs/cbi/luasrc/cbi.lua | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index 2e788be5f..6e0845565 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -729,21 +729,15 @@ function MultiValue.valuelist(self, section) end function MultiValue.validate(self, val) - if not(type(val) == "string") then - return nil - end + val = (type(val) == "table") and val or {val} - local result = "" + local result - for value in val:gmatch("[^\n]+") do + for i, value in ipairs(val) do if luci.util.contains(self.keylist, value) then - result = result .. self.delimiter .. value + result = result and (result .. self.delimiter .. value) or value end end - if result:len() > 0 then - return result:sub(self.delimiter:len() + 1) - else - return nil - end + return result end -- 2.11.0