diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-18 19:33:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-18 19:33:36 +0100 |
| commit | 14017b7032502096b04edc72f968b9407ce3b2cc (patch) | |
| tree | 58562fbe1ad5d6ec2bc3c2adbe0b46dd0339ca32 | |
| parent | f245198652f3969f8f4a242ae46d9ba735669621 (diff) | |
| parent | 602f4a2b54105cde6dbdda29862ccf2bfa32ca26 (diff) | |
| download | forums-14017b7032502096b04edc72f968b9407ce3b2cc.tar forums-14017b7032502096b04edc72f968b9407ce3b2cc.tar.gz forums-14017b7032502096b04edc72f968b9407ce3b2cc.tar.bz2 forums-14017b7032502096b04edc72f968b9407ce3b2cc.tar.xz forums-14017b7032502096b04edc72f968b9407ce3b2cc.zip | |
Merge remote-tracking branch 'github-exreaction/ticket/12210' into develop-olympus
* github-exreaction/ticket/12210:
[ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 2 |
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); } |