From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 27 Jan 2009 17:15:58 +0000 (+0000)
Subject: Merge r4168
X-Git-Tag: 0.8.5~24
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=aa5a88985d3a634a02f8af4e1f67a41d6a613119;p=project%2Fluci.git

Merge r4168
---

diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/admin-core/luasrc/tools/webadmin.lua
index 62168ebb7..0e09be980 100644
--- a/modules/admin-core/luasrc/tools/webadmin.lua
+++ b/modules/admin-core/luasrc/tools/webadmin.lua
@@ -66,7 +66,9 @@ function network_get_addresses(net)
 	local mav4 = state:get("network", net, "netmask")
 	local ipv6 = state:get("network", net, "ip6addr")
 	
-	if ipv4 and mav4 and #ipv4 > 0 and #mav4 > 0 then
+	if ipv4 and #ipv4 > 0 then
+		if mav4 and #mav4 == 0 then mav4 = nil end
+
 		ipv4 = luci.ip.IPv4(ipv4, mav4)
 		
 		if ipv4 then