mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[feature/postgresql-fulltext-search] use version_compare

Browse Source 
version_compare is used for version comparision and pgsql version is now
a global variable that is displayed in the acp too.

PHPBB3-9730
This commit is contained in:
Dhruv Goel
2012-06-16 03:05:40 +05:30
parent 8ba510a99d
commit ebc4c20199
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
var $tsearch_query; var $tsearch_query;
var $common_words = array(); var $common_words = array();
var $tsearch_usable = false; var $tsearch_usable = false;
var $version;
public function __construct(&$error) public function __construct(&$error)
{ {
@@ -39,8 +40,9 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
if ($db->sql_layer == 'postgres') if ($db->sql_layer == 'postgres')
{ {
$pgsql_version = explode('.', substr($db->sql_server_info(), 10)); $pgsql_version = explode(',', substr($db->sql_server_info(), 10));
if ($pgsql_version[0] >= 9 || $pgsql_version[0] == 8 && $pgsql_version[1] >= 3) $this->version = trim($pgsql_version[0]);
if(version_compare($this->version, '8.3', '>='))
{ {
$this->tsearch_usable = true; $this->tsearch_usable = true;
} }
@@ -778,12 +780,10 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
{ {
global $user, $config, $db; global $user, $config, $db;
$pgsql_version = explode(',', substr($db->sql_server_info(), 10));
$tpl = ' $tpl = '
<dl> <dl>
<dt><label>' . $user->lang['FULLTEXT_POSTGRES_VERSION_CHECK'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN'] . '</span></dt> <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> <dd>' . (($this->tsearch_usable) ? $user->lang['YES'] : $user->lang['NO']) . ' (PostgreSQL ' . $this->version . ')</dd>
</dl> </dl>
<dl> <dl>
<dt><label>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt> <dt><label>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt>