From: Steven Barth <steven@midlink.org>
Date: Tue, 22 Apr 2008 14:37:20 +0000 (+0000)
Subject: * Fixed a bug in CBI throwing an error if a config section gets deleted
X-Git-Tag: 0.8.0~1116
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7eb6eebf51c300d6e3f71faae520d461b6babe7d;p=oweals%2Fluci.git

* Fixed a bug in CBI throwing an error if a config section gets deleted
* Fixed automatic restart of olsrd while applying OLSR configuration
---

diff --git a/core/contrib/uci/luci b/core/contrib/uci/luci
index 7cc08215a..10a05bdee 100644
--- a/core/contrib/uci/luci
+++ b/core/contrib/uci/luci
@@ -17,7 +17,7 @@ config extern flash_keep
 config event uci_oncommit
         option network	"/etc/init.d/network restart"
         option wireless	"/etc/init.d/network restart"
-        option olsrd	"/etc/init.d/olsrd restart"
+        option olsr		"/etc/init.d/olsrd restart"
         option dhcp		"/etc/init.d/dnsmasq restart"
         option luci_fw  "/etc/init.d/luci_fw restart"
         option dropbear "/etc/init.d/dropbear restart"
diff --git a/core/src/ffluci/cbi.lua b/core/src/ffluci/cbi.lua
index 435977a17..f09d48ad7 100644
--- a/core/src/ffluci/cbi.lua
+++ b/core/src/ffluci/cbi.lua
@@ -178,6 +178,11 @@ function Map.del(self, section, option)
 			self.ucidata[section][option] = nil
 		else
 			self.ucidata[section] = nil
+			for i, k in ipairs(self.ucidata[".order"]) do
+				if section == k then
+					table.remove(self.ucidata[".order"], i)
+				end
+			end
 		end
 	end
 	return stat