From 493b8d5ce202c1276ca0968ea80e41a666add36c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 29 Oct 2024 08:12:30 +0100
Subject: Fix regex parentheses of referenced search (#6950)

fix https://github.com/FreshRSS/FreshRSS/issues/6949
---
 app/Models/BooleanSearch.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/Models/BooleanSearch.php b/app/Models/BooleanSearch.php
index ede705416..62d4cf9c1 100644
--- a/app/Models/BooleanSearch.php
+++ b/app/Models/BooleanSearch.php
@@ -79,7 +79,7 @@ class FreshRSS_BooleanSearch {
 					if (!empty($queries[$name])) {
 						$fromS[] = $matches[0][$i];
 						if ($allowUserQueries) {
-							$toS[] = '(' . $queries[$name] . ')';
+							$toS[] = '(' . self::escapeRegexParentheses($queries[$name]) . ')';
 						} else {
 							$toS[] = '';
 						}
@@ -120,7 +120,7 @@ class FreshRSS_BooleanSearch {
 					if (!empty($queries[$id])) {
 						$fromS[] = $matches[0][$i];
 						if ($allowUserQueries) {
-							$toS[] = '(' . $queries[$id] . ')';
+							$toS[] = '(' . self::escapeRegexParentheses($queries[$id]) . ')';
 						} else {
 							$toS[] = '';
 						}
@@ -137,7 +137,7 @@ class FreshRSS_BooleanSearch {
 	 * Temporarily escape parentheses used in regex expressions.
 	 */
 	public static function escapeRegexParentheses(string $input): string {
-		return preg_replace_callback('#(?<=[\\s(:!-]|^)(?<![\\\\])/.*?(?<!\\\\)/[im]*#',
+		return preg_replace_callback('#(?<=[\\s(:!-]|^)(?<![\\\\])/.+?(?<!\\\\)/[im]*#',
 			fn(array $matches): string => str_replace(['(', ')'], ['\\u0028', '\\u0029'], $matches[0]),
 			$input
 		) ?? '';
-- 
cgit v1.2.3