From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 4 Dec 2019 17:04:20 +0000 (+0100)
Subject: luci-base: ui.js: ensure that select choice labels are properly escaped
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71d370a964f3ec4970bcded9198ff559316902ff;p=oweals%2Fluci.git

luci-base: ui.js: ensure that select choice labels are properly escaped

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index faf05211d..31f89339c 100644
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -312,7 +312,7 @@ var UISelect = UIElement.extend({
 				frameEl.lastChild.appendChild(E('option', {
 					'value': '',
 					'selected': (this.values.length == 0 || this.values[0] == '') ? '' : null
-				}, this.choices[''] || this.options.placeholder || _('-- Please choose --')));
+				}, [ this.choices[''] || this.options.placeholder || _('-- Please choose --') ]));
 
 			for (var i = 0; i < keys.length; i++) {
 				if (keys[i] == null || keys[i] == '')
@@ -321,7 +321,7 @@ var UISelect = UIElement.extend({
 				frameEl.lastChild.appendChild(E('option', {
 					'value': keys[i],
 					'selected': (this.values.indexOf(keys[i]) > -1) ? '' : null
-				}, this.choices[keys[i]] || keys[i]));
+				}, [ this.choices[keys[i]] || keys[i] ]));
 			}
 		}
 		else {