luci-0.8: merge r4809

This commit is contained in:
Jo-Philipp Wich 2009-06-08 20:40:55 +00:00
parent e2e0b2cfd2
commit 3358db7faf

View file

@ -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">