diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-18 19:34:08 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-18 19:34:08 +0100 |
| commit | 7a21d99b9b8e16f0ed9ea8b0f938184582b825f8 (patch) | |
| tree | 902f8c9f386963a6c7f0410c486006395909a878 /phpBB/phpbb/db | |
| parent | 061d9fba5a1532aad4fe5026c50020ab7399cb1e (diff) | |
| parent | 14017b7032502096b04edc72f968b9407ce3b2cc (diff) | |
| download | forums-7a21d99b9b8e16f0ed9ea8b0f938184582b825f8.tar forums-7a21d99b9b8e16f0ed9ea8b0f938184582b825f8.tar.gz forums-7a21d99b9b8e16f0ed9ea8b0f938184582b825f8.tar.bz2 forums-7a21d99b9b8e16f0ed9ea8b0f938184582b825f8.tar.xz forums-7a21d99b9b8e16f0ed9ea8b0f938184582b825f8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/tools.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 65098b643b..3a7207e743 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -492,7 +492,7 @@ class 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); } |