From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 24 Sep 2009 16:52:27 +0000 (+0000)
Subject: luci-0.9: merge r5340
X-Git-Tag: 0.9.0~123
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=edda488b29cf48be25486536390a8e4f8595fac9;p=oweals%2Fluci.git

luci-0.9: merge r5340
---

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 83f5c27e7..d391acf7c 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -369,7 +369,7 @@ function Map.parse(self, readinput, ...)
 		for i, config in ipairs(self.parsechain) do
 			self.uci:save(config)
 		end
-		if self:submitstate() and not self.proceed and (self.flow.autoapply or luci.http.formvalue("cbi.apply")) then
+		if self:submitstate() and ((not self.proceed and self.flow.autoapply) or luci.http.formvalue("cbi.apply")) then
 			for i, config in ipairs(self.parsechain) do
 				self.uci:commit(config)
 
@@ -1292,6 +1292,22 @@ function AbstractValue.parse(self, section, novld)
 	local fvalue = self:formvalue(section)
 	local cvalue = self:cfgvalue(section)
 
+	-- If favlue and cvalue are both tables and have the same content
+	-- make them identical
+	if type(fvalue) == "table" and type(cvalue) == "table" then
+		local equal = #fvalue == #cvalue
+		if equal then
+			for i=1, #fvalue do
+				if cvalue[i] ~= fvalue[i] then
+					equal = false
+				end
+			end
+		end
+		if equal then
+			fvalue = cvalue
+		end
+	end
+
 	if fvalue and #fvalue > 0 then -- If we have a form value, write it to UCI
 		fvalue = self:transform(self:validate(fvalue, section))
 		if not fvalue and not novld then