2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_0.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_0.php
index 26937d6d80..b3da3a831d 100644
--- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_0.php
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_0.php
@@ -731,7 +731,7 @@ class release_3_0_0 extends \phpbb\db\migration\migration
 						'title_match'	=> array('BOOL', 0),
 					),
 					'KEYS'	=> array(
-						'unq_mtch'	=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
+						'un_mtch'	=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
 						'word_id'	=> array('INDEX', 'word_id'),
 						'post_id'	=> array('INDEX', 'post_id'),
 					),
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 18defc4535..10eb517d90 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -2079,7 +2079,7 @@ class tools
 		$statements = array();
 
 		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
+		if (strlen($table_name . '_' . $index_name) - strlen($table_prefix) > 24)
 		{
 			$max_length = strlen($table_prefix) + 24;
 			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);