Permalink
Browse files

Fulltext search edit - fixes #4387 (#4388)

* Fix innodb fulltext version check
Signed by Shawn Bulen, bulens@pacbell.net

* Clarify fulltext message
Signed by Shawn Bulen, bulens@pacbell.net
  • Loading branch information...
sbulen authored and colinschoen committed Dec 7, 2017
1 parent 20ec187 commit e39a06850836671347575a3283a3fe5d8df38c9f
Showing with 2 additions and 2 deletions.
  1. +1 −1 Sources/ManageSearch.php
  2. +1 −1 Themes/default/languages/Search.english.php
View
@@ -850,7 +850,7 @@ function detectFulltextIndex()
if ($request !== false)
{
while ($row = $smcFunc['db_fetch_assoc']($request))
if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'](), '5.6.4', '>=')))
$context['cannot_create_fulltext'] = true;
$smcFunc['db_free_result']($request);
}
@@ -53,7 +53,7 @@
$txt['search_method_fulltext_index'] = 'Fulltext index';
$txt['search_method_no_index_exists'] = 'doesn\'t currently exist';
$txt['search_method_fulltext_create'] = 'create a fulltext index';
$txt['search_method_fulltext_cannot_create'] = 'cannot be created because the max message length is above 65,535 or table type is not MyISAM';
$txt['search_method_fulltext_cannot_create'] = 'cannot be created because fulltext search is not supported for your MySQL engine and version';
$txt['search_method_index_already_exists'] = 'already created';
$txt['search_method_fulltext_remove'] = 'remove fulltext index';
$txt['search_method_index_partial'] = 'partially created';

0 comments on commit e39a068

Please sign in to comment.