[ticket/12561] Add check to see if "after" column actually exists

If not, just append to the end

PHPBB3-12561
This commit is contained in:
PayBas 2014-05-26 19:28:37 +02:00
parent 05839f8599
commit c51b926631

View file

@ -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
{