From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 30 Oct 2010 18:26:46 +0000 (+0000)
Subject: libs/core: fix luci.model.firewall.rename_zone()
X-Git-Tag: 0.10.0~542
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=141095fa7ff67dbe49bc0c775895fb276dfaf976;p=oweals%2Fluci.git

libs/core: fix luci.model.firewall.rename_zone()
---

diff --git a/libs/core/luasrc/model/firewall.lua b/libs/core/luasrc/model/firewall.lua
index 713fc5704..c13f5d6a1 100644
--- a/libs/core/luasrc/model/firewall.lua
+++ b/libs/core/luasrc/model/firewall.lua
@@ -181,7 +181,10 @@ function rename_zone(self, old, new)
 	if _valid_id(new) and not self:get_zone(new) then
 		uci_r:foreach("firewall", "zone",
 			function(s)
-				if n and s.name == old then
+				if old and s.name == old then
+					if not s.network then
+						uci_r:set("firewall", s['.name'], "network", old)
+					end
 					uci_r:set("firewall", s['.name'], "name", new)
 					r = true
 					return false
@@ -209,10 +212,10 @@ function rename_zone(self, old, new)
 					end
 				end)
 
-			ub.uci:foreach("firewall", "forwarding",
+			uci_r:foreach("firewall", "forwarding",
 				function(s)
 					if s.src == old then
-						ub.uci:set("firewall", s['.name'], "src", new)
+						uci_r:set("firewall", s['.name'], "src", new)
 					end
 					if s.dest == old then
 						uci_r:set("firewall", s['.name'], "dest", new)