From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 20 Jan 2020 17:57:47 +0000 (+0100)
Subject: luci-app-firewall: fix variable clash leading to incorrect family display
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9fd7e9fc23647fe7adfe84d1bc3b406ab52186e7;p=project%2Fluci.git

luci-app-firewall: fix variable clash leading to incorrect family display

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
index b68f428d95..ada05f24ca 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
@@ -29,7 +29,7 @@ function rule_proto_txt(s, ctHelpers) {
 	} : null;
 
 	m = String(uci.get('firewall', s, 'mark')).match(/^(!\s*)?(0x[0-9a-f]{1,8}|[0-9]{1,10})(?:\/(0x[0-9a-f]{1,8}|[0-9]{1,10}))?$/i);
-	var f = m ? {
+	var w = m ? {
 		val:  m[0].toUpperCase().replace(/X/g, 'x'),
 		inv:  m[1],
 		num:  '0x%02X'.format(+m[2]),
@@ -51,7 +51,7 @@ function rule_proto_txt(s, ctHelpers) {
 		dest: uci.get('firewall', s, 'dest'),
 		proto: proto,
 		helper: h,
-		mark:   f,
+		mark:   w,
 		dscp:   d
 	});
 }