2 files changed, 28 insertions, 2 deletions
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 0794567f1b..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -84,8 +84,6 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 		return array(
 			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
 
-			array('config.add', array('allow_password_reset', 1)),
-
 			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
 			array('config.add', array('fulltext_postgres_min_word_len', 4)),
 			array('config.add', array('fulltext_postgres_max_word_len', 254)),
diff --git a/phpBB/includes/db/migration/data/310/forgot_password.php b/phpBB/includes/db/migration/data/310/forgot_password.php
new file mode 100644
index 0000000000..a553e51f35
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/forgot_password.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_forgot_password extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['allow_password_reset']);
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('allow_password_reset', 1)),
+		);
+	}
+}