From c51b926631eb8e339c7a29cf3ff145e9e158b04f Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 26 May 2014 19:28:37 +0200 Subject: [PATCH] [ticket/12561] Add check to see if "after" column actually exists If not, just append to the end PHPBB3-12561 --- phpBB/phpbb/db/migration/schema_generator.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php index 872430e078..f36e6a96d5 100644 --- a/phpBB/phpbb/db/migration/schema_generator.php +++ b/phpBB/phpbb/db/migration/schema_generator.php @@ -112,7 +112,15 @@ class schema_generator $columns = $this->tables[$table]['COLUMNS']; $offset = array_search($column_data['after'], array_keys($columns)); unset($column_data['after']); - $this->tables[$table]['COLUMNS'] = array_merge(array_slice($columns, 0, $offset + 1, true), array($column => array_values($column_data)), array_slice($columns, $offset)); + + if ($offset == false) + { + $this->tables[$table]['COLUMNS'][$column] = array_values($column_data); + } + else + { + $this->tables[$table]['COLUMNS'] = array_merge(array_slice($columns, 0, $offset + 1, true), array($column => array_values($column_data)), array_slice($columns, $offset)); + } } else {