From ea6f5379dc147bdc83b687a8bbf011edd07d16fc Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 25 Sep 2011 11:59:21 +0000
Subject: [PATCH] libs/web: network widget fixes

---
 libs/web/luasrc/view/cbi/network_ifacelist.htm | 2 +-
 libs/web/luasrc/view/cbi/network_netinfo.htm   | 2 +-
 libs/web/luasrc/view/cbi/network_netlist.htm   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index 76ea74aca..a6565eb9f 100644
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -25,7 +25,7 @@
 		local n = self.network and net:get_network(self.network)
 		if n then
 			local i
-			for _, i in ipairs(n:is_bridge() and n:get_interfaces() or { n:get_interface() }) do
+			for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do
 				checked[i:name()] = true
 			end
 		end
diff --git a/libs/web/luasrc/view/cbi/network_netinfo.htm b/libs/web/luasrc/view/cbi/network_netinfo.htm
index 89389f8bb..f364ca088 100644
--- a/libs/web/luasrc/view/cbi/network_netinfo.htm
+++ b/libs/web/luasrc/view/cbi/network_netinfo.htm
@@ -15,7 +15,7 @@
 	<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
 		<%
 			local empty = true
-			for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
+			for _, iface in ipairs(net:get_interfaces() or { net:get_interface() }) do
 				if not iface:is_bridge() then
 					empty = false
 		 %>
diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/libs/web/luasrc/view/cbi/network_netlist.htm
index 17239325e..fab7883b2 100644
--- a/libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/libs/web/luasrc/view/cbi/network_netlist.htm
@@ -36,7 +36,7 @@
 						if not iface:is_bridge() then
 							empty = false
 				 %>
-					<img<%=attr("title", pcdata(iface:get_i18n()))%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+					<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
 				<% end end %>
 				<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
 			</span>
-- 
2.25.1