Merge branch 'main' into 3.x

arukompas · arukompas · commit 69d886a77961 · 2023-10-10T14:42:12.000+03:00
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=dadc2684c772ac2969fd50f50cc84fb3",
+    "/app.js": "/app.js?id=a9c7dc2c5d650205333810ac101da5e4",
     "/app.css": "/app.css?id=1d3e1405b5f756d27f515e824e61f265",
     "/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",
     "/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
@@ -15,7 +15,8 @@ export const highlightSearchResult = (text, query = null) => {
   // while escaping the rest of the HTML entities
   return escapeHtml(text)
     .replace(/&lt;mark&gt;/g, '<mark>')
-    .replace(/&lt;\/mark&gt;/g, '</mark>');
+    .replace(/&lt;\/mark&gt;/g, '</mark>')
+    .replace(/&lt;br\/&gt;/g, '<br/>');
 };
 
 export const escapeHtml = (text) => {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "/app.js": "/app.js?id=dadc2684c772ac2969fd50f50cc84fb3",`
	`2`	`+ "/app.js": "/app.js?id=a9c7dc2c5d650205333810ac101da5e4",`
`3`	`3`	`"/app.css": "/app.css?id=1d3e1405b5f756d27f515e824e61f265",`
`4`	`4`	`"/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",`
`5`	`5`	`"/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",`