2 files changed, 99 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index eeb628b18f..5080587681 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -214,7 +214,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	{
 		if ($terms == 'all')
 		{
-			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#');
+			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#(^|\s)\+#', '#(^|\s)-#', '#(^|\s)\|#');
 			$replace	= array(' +', ' |', ' -', ' +', ' -', ' |');
 
 			$keywords = preg_replace($match, $replace, $keywords);
diff --git a/tests/search/common_test_case.php b/tests/search/common_test_case.php
index dd04f7048c..029637b00b 100644
--- a/tests/search/common_test_case.php
+++ b/tests/search/common_test_case.php
@@ -86,6 +86,104 @@ abstract class phpbb_search_common_test_case extends phpbb_search_test_case
 				array('-fooo', '-baar'),
 				array(),
 			),
+			array(
+				'fooo -fooo',
+				'all',
+				true,
+				array('fooo', '-fooo'),
+				array(),
+			),
+			array(
+				'fooo fooo-',
+				'all',
+				true,
+				array('fooo', 'fooo'),
+				array(),
+			),
+			array(
+				'-fooo fooo',
+				'all',
+				true,
+				array('-fooo', 'fooo'),
+				array(),
+			),
+			array(
+				'fooo- fooo',
+				'all',
+				true,
+				array('fooo', 'fooo'),
+				array(),
+			),
+			array(
+				'fooo-baar fooo',
+				'all',
+				true,
+				array('fooo', 'baar', 'fooo'),
+				array(),
+			),
+			array(
+				'fooo-baar -fooo',
+				'all',
+				true,
+				array('fooo', 'baar', '-fooo'),
+				array(),
+			),
+			array(
+				'fooo-baar fooo-',
+				'all',
+				true,
+				array('fooo', 'baar', 'fooo'),
+				array(),
+			),
+			array(
+				'fooo-baar baar',
+				'all',
+				true,
+				array('fooo', 'baar', 'baar'),
+				array(),
+			),
+			array(
+				'fooo-baar -baar',
+				'all',
+				true,
+				array('fooo', 'baar', '-baar'),
+				array(),
+			),
+			array(
+				'fooo-baar baar-',
+				'all',
+				true,
+				array('fooo', 'baar', 'baar'),
+				array(),
+			),
+			array(
+				'fooo-baar fooo-baar',
+				'all',
+				true,
+				array('fooo', 'baar', 'fooo', 'baar'),
+				array(),
+			),
+			array(
+				'fooo-baar -fooo-baar',
+				'all',
+				true,
+				array('fooo', 'baar', '-fooo', 'baar'),
+				array(),
+			),
+			array(
+				'fooo-baar fooo-baar-',
+				'all',
+				true,
+				array('fooo', 'baar', 'fooo', 'baar'),
+				array(),
+			),
+			array(
+				'fooo-baar-baaz',
+				'all',
+				true,
+				array('fooo', 'baar', 'baaz'),
+				array(),
+			),
 		);
 	}