From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 20 Jan 2015 14:21:14 +0000 (+0100)
Subject: WEBUI: Fix the LovCombo regex handling - fixes #2598
X-Git-Tag: v4.1~446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b28f37bf8a196e2c2672633197b99703d9aa98e0;p=thirdparty%2Ftvheadend.git

WEBUI: Fix the LovCombo regex handling - fixes #2598
---

diff --git a/src/webui/static/lovcombo/lovcombo-all.js b/src/webui/static/lovcombo/lovcombo-all.js
index 789817deb..4463cf342 100644
--- a/src/webui/static/lovcombo/lovcombo-all.js
+++ b/src/webui/static/lovcombo/lovcombo-all.js
@@ -167,7 +167,8 @@ Ext.ux.form.LovCombo = Ext.extend(Ext.form.ComboBox, {
 	 * @private
 	 */
 	,onBeforeQuery:function(qe) {
-		qe.query = qe.query.replace(new RegExp(this.getCheckedDisplay() + '[ ' + this.separator + ']*'), '');
+	        var d = tvheadend.regexEscape(this.getCheckedDisplay());
+		qe.query = qe.query.replace(new RegExp(d + '[ ' + this.separator + ']*'), '');
 	} // eo function onBeforeQuery
 	// }}}
 	// {{{