mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 17:15:19 +02:00
Code Issues Releases Wiki Activity

Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into develop

Browse Source 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11288:
  [ticket/11288] fix regex in postgres
  [ticket/11288] add search tests cases
This commit is contained in:
Oleg Pudeyev 2013-05-06 15:46:00 -04:00
commit 01eded7cc2
2 changed files with 99 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/search/fulltext_postgres.php
View File

@ -214,7 +214,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
{ {
if ($terms == 'all') 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(' +', ' |', ' -', ' +', ' -', ' |'); $replace = array(' +', ' |', ' -', ' +', ' -', ' |');
$keywords = preg_replace($match, $replace, $keywords); $keywords = preg_replace($match, $replace, $keywords);

98
tests/search/common_test_case.php
View File

@ -86,6 +86,104 @@ abstract class phpbb_search_common_test_case extends phpbb_search_test_case
array('-fooo', '-baar'), array('-fooo', '-baar'),
array(), 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(),
),
); );
} }