mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

[ticket/15540] Method init

Browse Source 
PHPBB3-15540
This commit is contained in:
rubencm
2021-03-22 18:46:58 +01:00
parent 457c750773
commit fd45ce1e91
6 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
phpBB/phpbb/search/backend/fulltext_mysql.php
View File

@@ -121,38 +121,18 @@ class fulltext_mysql extends base implements search_backend_interface
*/
public function is_available(): bool
{
return $this->db->get_sql_layer() == 'mysqli';
// Check if we are using mysql
if($this->db->get_sql_layer() != 'mysqli')
{
return false;
}
return true;
}
/**
* {@inheritdoc}
*/
public function get_search_query(): string
{
return $this->search_query;
}
/**
* {@inheritdoc}
*/
public function get_common_words(): array
{
return $this->common_words;
}
/**
* {@inheritdoc}
*/
public function get_word_length(): array
{
return $this->word_length;
}
/**
* Checks for correct MySQL version and stores min/max word length in the config
*
* @return string|bool Language key of the error/incompatibility occurred
*/
public function init()
{
if (!$this->is_available())
@@ -164,15 +144,7 @@ class fulltext_mysql extends base implements search_backend_interface
$info = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
$engine = '';
if (isset($info['Engine']))
{
$engine = $info['Engine'];
}
else if (isset($info['Type']))
{
$engine = $info['Type'];
}
$engine = $info['Engine'] ?? $info['Type'] ?? '';
$fulltext_supported = $engine === 'Aria' || $engine === 'MyISAM'
/**
@@ -182,7 +154,7 @@ class fulltext_mysql extends base implements search_backend_interface
* fixed for proper overall operation. Hence we require 5.6.8.
*/
|| ($engine === 'InnoDB'
&& phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>='));
&& phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>='));
if (!$fulltext_supported)
{
@@ -214,6 +186,30 @@ class fulltext_mysql extends base implements search_backend_interface
return false;
}
/**
* {@inheritdoc}
*/
public function get_search_query(): string
{
return $this->search_query;
}
/**
* {@inheritdoc}
*/
public function get_common_words(): array
{
return $this->common_words;
}
/**
* {@inheritdoc}
*/
public function get_word_length(): array
{
return $this->word_length;
}
/**
* {@inheritdoc}
*/