From f03453c0633486db776b40b1153c652192373749 Mon Sep 17 00:00:00 2001
From: crowjake <jmirzaian@gmail.com>
Date: Sat, 6 Jul 2024 00:50:12 +0100
Subject: [PATCH] [ticket/17365] Add spaces before +, -, and | to correct
 keyword count.

Prevents keyword limit being bypassed with the use of `+`, `-` and `|` in search queries, because $num_keywords depends on spaces to count the number of words.
---
 phpBB/phpbb/search/fulltext_native.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 7fc5e002ba..8fa8bc84ae 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -289,6 +289,7 @@ class fulltext_native extends \phpbb\search\base
 			'#(\+|\-)(?:\+|\-)+#',
 			'#\(\|#',
 			'#\|\)#',
+			'#(?<!\s)(\+|\-|\|)#',
 		);
 		$replace = array(
 			' ',
@@ -296,6 +297,7 @@ class fulltext_native extends \phpbb\search\base
 			'$1',
 			'(',
 			')',
+			' $1',
 		);
 
 		$keywords = preg_replace($match, $replace, $keywords);