diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-27 16:18:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-27 16:18:41 +0200 |
| commit | 31192fc08e2cc12efa0a59a2edb9128ed806d3db (patch) | |
| tree | 875c1db3c584734fefc1e387e443bb047bdd41b7 /phpBB/phpbb | |
| parent | 3433f61ccbbb177015985d7457dfe0735edd5cf7 (diff) | |
| parent | 79bcb20ac53ab76e6a3590651a6598e95b64e25f (diff) | |
| download | forums-31192fc08e2cc12efa0a59a2edb9128ed806d3db.tar forums-31192fc08e2cc12efa0a59a2edb9128ed806d3db.tar.gz forums-31192fc08e2cc12efa0a59a2edb9128ed806d3db.tar.bz2 forums-31192fc08e2cc12efa0a59a2edb9128ed806d3db.tar.xz forums-31192fc08e2cc12efa0a59a2edb9128ed806d3db.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 4e881e5f0c..4d3e13663d 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -188,7 +188,7 @@ class fulltext_mysql extends \phpbb\search\base } $sql = 'SHOW VARIABLES - LIKE \'ft\_%\''; + LIKE \'%ft\_%\''; $result = $this->db->sql_query($sql); $mysql_info = array(); @@ -198,8 +198,16 @@ class fulltext_mysql extends \phpbb\search\base } $this->db->sql_freeresult($result); - $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']); + if ($engine === 'MyISAM') + { + $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; } |