aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2014-02-17 23:46:39 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2014-02-17 23:46:39 -0600
commit602f4a2b54105cde6dbdda29862ccf2bfa32ca26 (patch)
tree58562fbe1ad5d6ec2bc3c2adbe0b46dd0339ca32 /phpBB
parentf245198652f3969f8f4a242ae46d9ba735669621 (diff)
downloadforums-602f4a2b54105cde6dbdda29862ccf2bfa32ca26.tar
forums-602f4a2b54105cde6dbdda29862ccf2bfa32ca26.tar.gz
forums-602f4a2b54105cde6dbdda29862ccf2bfa32ca26.tar.bz2
forums-602f4a2b54105cde6dbdda29862ccf2bfa32ca26.tar.xz
forums-602f4a2b54105cde6dbdda29862ccf2bfa32ca26.zip
[ticket/12210] dbtools::sql_create_table incorrectly throws error
related to auto-increment length on non auto-increment fields PHPBB3-12210
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/db/db_tools.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f63ff18cbe..e394b1ffa0 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -477,7 +477,7 @@ class phpbb_db_tools
// here lies an array, filled with information compiled on the column's data
$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
- if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
+ if (isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'] && strlen($column_name) > 26) // "${column_name}_gen"
{
trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
}