aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/tools.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-07 16:49:37 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-07 16:49:37 +0200
commit9b36b5283cc29f59428206726f666554b0e0a358 (patch)
tree7e253d5bf14e8cfbc16b58733e2d55c8c6f0f224 /phpBB/phpbb/db/tools.php
parentab8a197e92c491ac37f8ffe2fff1f7c6c42167b6 (diff)
parent2b3e15cf64fdc3f3f1fd4067321c92d4a20c1dd9 (diff)
downloadforums-9b36b5283cc29f59428206726f666554b0e0a358.tar
forums-9b36b5283cc29f59428206726f666554b0e0a358.tar.gz
forums-9b36b5283cc29f59428206726f666554b0e0a358.tar.bz2
forums-9b36b5283cc29f59428206726f666554b0e0a358.tar.xz
forums-9b36b5283cc29f59428206726f666554b0e0a358.zip
Merge pull request #2761 from Nicofuma/ticket/12873
[ticket/12873] Test the correct identifier in \phpbb\db\tools * Nicofuma/ticket/12873: [ticket/12873] Add migration to rename the index [ticket/12873] Don not touch the existing migrations [ticket/12873] Test the good identifier in \phpbb\db\tools
Diffstat (limited to 'phpBB/phpbb/db/tools.php')
-rw-r--r--phpBB/phpbb/db/tools.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index ae0c695aa2..5d93eb8246 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -2104,7 +2104,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);