merge branch v2 (release 2.0.0-beta.50)

Author: marcantondahmen

CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
-## [v2.0.0-beta.49](https://github.com/marcantondahmen/automad/commit/ef38ad1d6590d0a9208812981bb907f9074f1257)
+## [v2.0.0-beta.50](https://github.com/marcantondahmen/automad/commit/395d62584987b5fb149a9b322b8206b708f57818)
 
-Sat, 18 Jul 2026 17:42:18 +0200
+Sun, 19 Jul 2026 12:24:34 +0200
+
+### Bugfixes
+
+- fix search and replace with html special characters ([395d62584](https://github.com/marcantondahmen/automad/commit/395d62584987b5fb149a9b322b8206b708f57818))
+
+## [v2.0.0-beta.49](https://github.com/marcantondahmen/automad/commit/c1c0bbe84dbca1ee70db59d5b89967d0193da1b1)
+
+Sat, 18 Jul 2026 17:45:06 +0200
 
 ### New Features
 

automad/src/server/App.php

@@ -56,7 +56,7 @@
  * @license See LICENSE.md for license information
  */
 class App {
-	const VERSION = '2.0.0-beta.49';
+	const VERSION = '2.0.0-beta.50';
 
 	/**
 	 * Required PHP version.

automad/src/server/Models/Search/Search.php

@@ -69,6 +69,11 @@ class Search {
 	 */
 	private string $searchValue;
 
+	/**
+	 * The search value with encoded HTML special characters.
+	 */
+	private string $searchValueSafeHtml;
+
 	/**
 	 * Strip tags before performing search.
 	 */
@@ -93,13 +98,15 @@ public function __construct(
 		?bool $stripTags = false
 	) {
 		$this->searchValue = preg_quote($searchValue, '/');
+		$this->searchValueSafeHtml = preg_quote(htmlspecialchars($searchValue), '/');
 		$this->regexFlags = 'ims';
 		$this->pagesToSearch = $pagesToSearch;
 		$this->stripTags = $stripTags;
 		$this->SearchIndex = $SearchIndexCache->getIndex();
 
 		if ($isRegex) {
 			$this->searchValue = str_replace('/', '\/', $searchValue);
+			$this->searchValueSafeHtml = str_replace('/', '\/', htmlspecialchars($searchValue));
 		}
 
 		if ($isCaseSensitive) {
@@ -150,6 +157,7 @@ public function searchTextField(string $field, string $content): ?FieldResults {
 
 		$contextRegex = '/(?:^|\s).{0,50}' . $this->searchValue . '.{0,50}(?:\s|$)/' . $this->regexFlags;
 		$searchRegex = '/' . $this->searchValue . '/' . $this->regexFlags;
+		$searchRegexSafeHtml = '/' . $this->searchValueSafeHtml . '/' . $this->regexFlags;
 
 		preg_match_all(
 			$contextRegex,
@@ -171,7 +179,7 @@ public function searchTextField(string $field, string $content): ?FieldResults {
 					$parts[] = preg_replace(
 						'/\s+/',
 						' ',
-						trim(preg_replace($searchRegex, '<mark>$0</mark>', htmlspecialchars($ctx[0])) ?? '')
+						trim(preg_replace($searchRegexSafeHtml, '<mark>$0</mark>', htmlspecialchars($ctx[0])) ?? '')
 					);
 				}
 			}

automad/tests/main/data/html-replaced/data

@@ -0,0 +1,7 @@
+{
+	"draft": {
+		"title": "HTML",
+		"html": "Text with HTML <span>entities</span>."
+    }
+}
+

automad/tests/main/data/html/data

@@ -0,0 +1,7 @@
+{
+	"draft": {
+		"title": "HTML",
+		"html": "Text&nbsp;with HTML <span>entities</span>."
+    }
+}
+

automad/tests/main/src/Models/Search/ReplacementTest.php

@@ -50,6 +50,16 @@ public static function dataForTestReplaceInDataIsSame() {
 				Data::load('/text'),
 				Data::load('/text-replaced')
 			),
+			// HTML, no regex, not case sensitive.
+			array(
+				' ',
+				' ',
+				false,
+				false,
+				array('html'),
+				Data::load('/html'),
+				Data::load('/html-replaced')
+			),
 			// Text, no regex, case sensitive.
 			array(
 				'/url/To/page',

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "automad",
-  "version": "2.0.0-beta.49",
+  "version": "2.0.0-beta.50",
   "description": "Automad",
   "author": "Marc Anton Dahmen",
   "private": true,