aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-06-03 15:16:57 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-06-03 15:16:57 +0200
commitd925c8d0daca58ce6f2a7b327e496c072c8a9fc8 (patch)
tree07220cda560fc65dd6b027f040a0e3248c04c6ac /phpBB
parent[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. (diff)
downloadphpbb-d925c8d0daca58ce6f2a7b327e496c072c8a9fc8.tar.gz
phpbb-d925c8d0daca58ce6f2a7b327e496c072c8a9fc8.tar.bz2
phpbb-d925c8d0daca58ce6f2a7b327e496c072c8a9fc8.zip
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
PHPBB3-11583
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/search/fulltext_mysql.php2
-rw-r--r--phpBB/language/en/acp/search.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index a2211bbe9b..f28b8885e7 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -95,7 +95,7 @@ class fulltext_mysql extends search_backend
if (!$fulltext_supported)
{
- return $user->lang['FULLTEXT_MYSQL_NOT_MYISAM'];
+ return $user->lang['FULLTEXT_MYSQL_NOT_SUPPORTED'];
}
$sql = 'SHOW VARIABLES
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index ded5584a7e..79ac75c833 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -53,7 +53,7 @@ $lang = array_merge($lang, array(
'DELETING_INDEX_IN_PROGRESS_EXPLAIN' => 'The search backend is currently cleaning its index. This can take a few minutes.',
'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION' => 'The MySQL fulltext backend can only be used with MySQL4 and above.',
- 'FULLTEXT_MYSQL_NOT_MYISAM' => 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.4 or later is required for fulltext indexes on InnoDB tables.',
+ 'FULLTEXT_MYSQL_NOT_SUPPORTED' => 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.4 or later is required for fulltext indexes on InnoDB tables.',
'FULLTEXT_MYSQL_TOTAL_POSTS' => 'Total number of indexed posts',
'FULLTEXT_MYSQL_MBSTRING' => 'Support for non-latin UTF-8 characters using mbstring:',
'FULLTEXT_MYSQL_PCRE' => 'Support for non-latin UTF-8 characters using PCRE:',