diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index e174f9712e..8e40a5283f 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -504,8 +504,8 @@ class acp_search_info 'title' => 'ACP_SEARCH', 'version' => '1.0.0', 'modes' => array( - 'settings' => array('title' => 'ACP_SEARCH_SETTINGS', 'auth' => 'acl_a_server'), - 'index' => array('title' => 'ACP_SEARCH_INDEX', 'auth' => 'acl_a_server'), + 'settings' => array('title' => 'ACP_SEARCH_SETTINGS', 'auth' => 'acl_a_search'), + 'index' => array('title' => 'ACP_SEARCH_INDEX', 'auth' => 'acl_a_search'), ), ); } diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 3d5381e2bc..74ffa08a81 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -48,6 +48,19 @@ class fulltext_mysql extends search_backend return $user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_VERSION']; } + $result = $db->sql_query('SHOW TABLE STATUS LIKE \'' . POSTS_TABLE . '\''); + $engine = $db->sql_fetchfield('Engine', 0, $result); + if (!$engine) + { + $engine = $db->sql_fetchfield('Type', 0, $result); + } + $db->sql_freeresult($result); + + if ($engine != 'MyISAM') + { + return $user->lang['FULLTEXT_MYSQL_NOT_MYISAM']; + } + $sql = 'SHOW VARIABLES LIKE \'ft\_%\''; $result = $db->sql_query($sql); |