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 482aa0c0c8bd05e4aaf6df1e6477be903d6124c2..5358caeae63e390d6d1c8592be76cd0693d2c1b4 100644 (file)
--- 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">