diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-12-10 17:44:45 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-12-10 17:44:45 +0000 |
| commit | f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb (patch) | |
| tree | 9b8bf50649470ecd571d06ee5c7f7eeb91a867c7 /phpBB/includes/search | |
| parent | 7e47135792a2cbf7e25ccdd184b4934b2a9e764d (diff) | |
| download | forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.gz forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.bz2 forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.xz forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.zip | |
- finally correctly calculate current time for birthday calculation [Bug #6030]
- allow searching forums with unsearchable subforums [Bug #6056]
- addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans
- do not index forums which have indexing disabled on index recreation [Bug #6060]
- properly handle html entities in the theme editor [Bug #6048]
- anonymous access is no longer required for the LDAP auth plugin [Bug #6046]
- corrected mcp_front queue link to point to approve_details [Bug #6134]
- added direct (dis)approval to mcp_front queue items [Bug #6134]
- proper mysql version test for fulltext-compatibility [Bug #6054]
- added note to style/language "used by" column so it's clear that bots are included
- correctly update bot last visit time [Bug #6108]
git-svn-id: file:///svn/phpbb/trunk@6740 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/search')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 8a102a321d..598299e316 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -49,16 +49,7 @@ class fulltext_mysql extends search_backend { global $db, $user; - if (strpos($db->sql_layer, 'mysql') === false) - { - return $user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_VERSION']; - } - - $result = $db->sql_query('SELECT VERSION() AS mysql_version'); - $version = $db->sql_fetchfield('mysql_version'); - $db->sql_freeresult($result); - - if (!preg_match('#^4|5|6#s', $version)) + if ($db->sql_layer != 'mysql4' && $db->sql_layer != 'mysqli') { return $user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_VERSION']; } |