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

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2019-07-27 16:18:41 +02:00
parent 3433f61ccb 79bcb20ac5
commit 31192fc08e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/search/fulltext_mysql.php
View File

@@ -188,7 +188,7 @@ class fulltext_mysql extends \phpbb\search\base
} }
$sql = 'SHOW VARIABLES $sql = 'SHOW VARIABLES
LIKE \'ft\_%\''; LIKE \'%ft\_%\'';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$mysql_info = array(); $mysql_info = array();
@@ -198,8 +198,16 @@ class fulltext_mysql extends \phpbb\search\base
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->config->set('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']); if ($engine === 'MyISAM')
$this->config->set('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']); {
$this->config->set('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']);
$this->config->set('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']);
}
else if ($engine === 'InnoDB')
{
$this->config->set('fulltext_mysql_max_word_len', $mysql_info['innodb_ft_max_token_size']);
$this->config->set('fulltext_mysql_min_word_len', $mysql_info['innodb_ft_min_token_size']);
}
return false; return false;
} }