From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 1 Sep 2011 16:07:57 +0000 (+0000)
Subject: luci-0.10: merge r7386
X-Git-Tag: 0.10.0~80
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5312e2919ea91b929a3e642e93cee36a3185143c;p=oweals%2Fluci.git

luci-0.10: merge r7386
---

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index 0dc93f968..a1b9f7451 100644
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -45,7 +45,7 @@
 			<% if link then -%><a href="<%=link%>"><% end -%>
 			<img title="<%=iface:get_type_i18n()%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
 			<% if link then -%></a><% end -%>
-			<%=iface:get_i18n()%><% local n = iface:get_network(); if n then %> (<a href="<%=n:adminlink()%>"><%=n:name()%></a>)<% end %>
+			<%=pcdata(iface:get_i18n())%><% local n = iface:get_network(); if n then %> (<a href="<%=n:adminlink()%>"><%=n:name()%></a>)<% end %>
 		</label>
 	</li>
 	<% end end %>
diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/libs/web/luasrc/view/cbi/network_netlist.htm
index 882b86a65..4119ed3e2 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", 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", pcdata(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>