mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00
Code Issues Releases Wiki Activity

[feature/postgresql-fulltext-search] removes pcre check

Browse Source 
PCRE UTF8 support is already checked globally. adds an option of
pgsql version to acp.

PHPBB3-9730
This commit is contained in:
Dhruv Goel 2012-06-12 05:07:05 +05:30
parent 2821dc3325
commit 8e035f9141
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
var $search_query;
var $tsearch_query;
var $common_words = array();
var $pcre_properties = false;
var $tsearch_usable = false;
public function __construct(&$error)
@ -37,11 +36,6 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
$this->word_length = array('min' => $config['fulltext_postgres_min_word_len'], 'max' => $config['fulltext_postgres_max_word_len']);
// PHP may not be linked with the bundled PCRE lib and instead with an older version
if (phpbb_pcre_utf8_support())
{
$this->pcre_properties = true;
}
if ($db->sql_layer == 'postgres')
{
@ -784,10 +778,12 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
{
global $user, $config, $db;
$pgsql_version = explode(',', substr($db->sql_server_info(), 10));
$tpl = '
<dl>
<dt><label>' . $user->lang['FULLTEXT_POSTGRES_PCRE'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_PCRE_EXPLAIN'] . '</span></dt>
<dd>' . (($this->pcre_properties) ? $user->lang['YES'] : $user->lang['NO']) . ' (PHP ' . PHP_VERSION . ')</dd>
<dt><label>' . $user->lang['FULLTEXT_POSTGRES_VERSION_CHECK'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN'] . '</span></dt>
<dd>' . (($this->tsearch_usable) ? $user->lang['YES'] : $user->lang['NO']) . ' (PostgreSQL ' . $pgsql_version[0] . ')</dd>
</dl>
<dl>
<dt><label>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt>

4
phpBB/language/en/acp/search.php
View File

@ -64,11 +64,11 @@ $lang = array_merge($lang, array(
'FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION' => 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
'FULLTEXT_POSTGRES_TS_NOT_USABLE' => 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
'FULLTEXT_POSTGRES_TOTAL_POSTS' => 'Total number of indexed posts',
'FULLTEXT_POSTGRES_PCRE' => 'Support for non-latin UTF-8 characters using PCRE:',
'FULLTEXT_POSTGRES_VERSION_CHECK' => 'PostgreSQL version',
'FULLTEXT_POSTGRES_TS_NAME' => 'Text search Configuration Profile:',
'FULLTEXT_POSTGRES_MIN_WORD_LEN' => 'Minimum word length for keywords',
'FULLTEXT_POSTGRES_MAX_WORD_LEN' => 'Maximum word length for keywords',
'FULLTEXT_POSTGRES_PCRE_EXPLAIN' => 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
'FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN' => 'This search backend requires PostgreSQL version 8.3 and above.',
'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN' => 'The Text search configuration profile used to determine the parser and dictionary.',
'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN' => 'Words with at least this many characters will be included in the query to the database.',
'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN' => 'Words with no more than this many characters will be included in the query to the database.',