From: Jo-Philipp Wich Date: Sun, 31 Jul 2011 12:38:04 +0000 (+0000) Subject: luci-0.10: merge r7341 X-Git-Tag: 0.10.0~87 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bfbda1b14d4eb5cd0ce1b9aa1b7ff611ba6b0b75;p=oweals%2Fluci.git luci-0.10: merge r7341 --- diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm index 16cd32a2c..aab8ead99 100644 --- a/modules/admin-full/luasrc/view/admin_status/index.htm +++ b/modules/admin-full/luasrc/view/admin_status/index.htm @@ -140,7 +140,7 @@ $Id$ '<%:Gateway%>: %s
', ifc.proto, (ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0', - (ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255', + (ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255', (ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0' );