diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js index efe9bc830..e17e33505 100644 --- a/client/components/main/globalSearch.js +++ b/client/components/main/globalSearch.js @@ -190,10 +190,10 @@ BlazeComponent.extendComponent({ this.searching.set(true); - const reOperator1 = `/^((?[\p{Letter}\p{Mark}]+):|(?[#@]))(?[\p{Letter}\p{Mark}]+)(\s+|$)/iu`; - const reOperator2 = `/^((?[\p{Letter}\p{Mark}]+):|(?[#@]))(?["']*)(?.*?)\k(\s+|$)/iu`; - const reText = `/^(?\S+)(\s+|$)/u`; - const reQuotedText = `/^(?["'])(?[\w\p{L}]+)\k(\s+|$)/u`; + const reOperator1 = /^((?[\p{Letter}\p{Mark}]+):|(?[#@]))(?[\p{Letter}\p{Mark}]+)(\s+|$)/iu; + const reOperator2 = /^((?[\p{Letter}\p{Mark}]+):|(?[#@]))(?["']*)(?.*?)\k(\s+|$)/iu; + const reText = /^(?\S+)(\s+|$)/u; + const reQuotedText = /^(?["'])(?[\w\p{L}]+)\k(\s+|$)/u; const operators = { 'operator-board': 'boards', diff --git a/models/boards.js b/models/boards.js index 01770f872..8db0f34bd 100644 --- a/models/boards.js +++ b/models/boards.js @@ -1263,12 +1263,12 @@ function boardRemover(userId, doc) { } Boards.uniqueTitle = title => { - const m = title.match(`/^(?.*?)\s*(\[(?<num>\d+)]\s*$|\s*$)/`); + const m = title.match(/^(?<title>.*?)\s*(\[(?<num>\d+)]\s*$|\s*$)/); const base = escapeForRegex(m.groups.title); let num = 0; Boards.find({ title: new RegExp(`^${base}\\s*\\[\\d+]\\s*$`) }).forEach( board => { - const m = board.title.match(`/^(?<title>.*?)\s*\[(?<num>\d+)]\s*$/`); + const m = board.title.match(/^(?<title>.*?)\s*\[(?<num>\d+)]\s*$/); if (m) { const n = parseInt(m.groups.num, 10); num = num < n ? n : num;