From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 15 Apr 2012 14:31:04 +0000 (+0000)
Subject: libs/web: fix html output for complex datatypes containing apostrophes
X-Git-Tag: 0.11.0~791
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=fd28386e35a947cf9966ae6fd8d2dd5673279bad

libs/web: fix html output for complex datatypes containing apostrophes
---

diff --git a/libs/web/luasrc/view/cbi/value.htm b/libs/web/luasrc/view/cbi/value.htm
index 180b16048b..19715a579d 100644
--- a/libs/web/luasrc/view/cbi/value.htm
+++ b/libs/web/luasrc/view/cbi/value.htm
@@ -5,7 +5,7 @@
 	%> />
 	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
 	<% if #self.keylist > 0 or self.datatype then -%>
-	<script type="text/javascript">
+	<script type="text/javascript">//<![CDATA[
 		<% if #self.keylist > 0 then -%>
 		cbi_combobox_init('<%=cbid%>', {
 		<%-
@@ -26,8 +26,8 @@
 		<%- end -%>');
 		<%- end %>
 		<% if self.datatype then -%>
-		cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype%>');
+		cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype:gsub("'", "\\'")%>');
 		<%- end %>
-	</script>
+	//]]></script>
 	<% end -%>
 <%+cbi/valuefooter%>