From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 8 Jun 2009 20:40:55 +0000 (+0000)
Subject: luci-0.8: merge r4809
X-Git-Tag: 0.8.8~6
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=3358db7fafa8041f30f1a8dd2a4898be0377de7f

luci-0.8: merge r4809
---

diff --git a/modules/admin-full/luasrc/view/admin_status/interfaces.htm b/modules/admin-full/luasrc/view/admin_status/interfaces.htm
index 482aa0c0c..5358caeae 100644
--- a/modules/admin-full/luasrc/view/admin_status/interfaces.htm
+++ b/modules/admin-full/luasrc/view/admin_status/interfaces.htm
@@ -63,7 +63,7 @@ $Id$
 	end
 
 	function get_vlan(i)
-		return i:match("^%w+%.(%d+)$")
+		return i and i:match("^%w+%.(%d+)$")
 	end
 
 	function get_vlan_ports(i)
@@ -178,7 +178,7 @@ $Id$
 				dev     = get_ifname(i)
 				vlan    = get_vlan(dev)
 
-				if devinfo and devinfo[dev] then
+				if dev and devinfo and devinfo[dev] then
 			%>
 				<h3><%:a_s_if_interface Interface%> <%=i['.name']%></h3>
 				<p style="font-size:90%;padding-left:1em">