2 files changed, 44 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/extensions_version_check_force_unstable.php b/phpBB/phpbb/db/migration/data/v310/extensions_version_check_force_unstable.php
new file mode 100644
index 0000000000..5941c3aa54
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/extensions_version_check_force_unstable.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class extensions_version_check_force_unstable extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\dev');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('extension_force_unstable', false)),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php
index 871fd97aca..818e27a362 100644
--- a/phpBB/phpbb/db/migration/schema_generator.php
+++ b/phpBB/phpbb/db/migration/schema_generator.php
@@ -109,7 +109,25 @@ class schema_generator
 							{
 								foreach ($add_columns as $column => $column_data)
 								{
-									$this->tables[$table]['COLUMNS'][$column] = $column_data;
+									if (isset($column_data['after']))
+									{
+										$columns = $this->tables[$table]['COLUMNS'];
+										$offset = array_search($column_data['after'], array_keys($columns));
+										unset($column_data['after']);
+
+										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
+									{
+										$this->tables[$table]['COLUMNS'][$column] = $column_data;
+									}
 								}
 							}
 						}