Avoiding accessing undefined tributeValues #26461 (#26462)

Backport #26461
go-gitea · Aug 12, 2023 · 9112ce2 · 9112ce2
1 parent 2bdc38e
commit 9112ce2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/web_src/js/features/tribute.js b/web_src/js/features/tribute.js
@@ -31,7 +31,7 @@ function makeCollections({mentions, emoji}) {
 
   if (mentions) {
     collections.push({
-      values: window.config.tributeValues,
+      values: window.config.tributeValues ?? [],
       requireLeadingSpace: true,
       menuItemTemplate: (item) => {
         return `

diff --git a/web_src/js/utils/match.js b/web_src/js/utils/match.js
@@ -32,7 +32,7 @@ export function matchMention(queryText) {
 
   // results is a map of weights, lower is better
   const results = new Map();
-  for (const obj of window.config.tributeValues) {
+  for (const obj of window.config.tributeValues ?? []) {
     const index = obj.key.toLowerCase().indexOf(query);
     if (index === -1) continue;
     const existing = results.get(obj);