4 files changed, 24 insertions, 5 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index de0cccd234..d09f71ae22 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -896,8 +896,7 @@ if (!$get_info)
 				array('user_regdate',			'users.user_regdate',				''),
 				array('username',				'users.username',					'phpbb_set_default_encoding'), // recode to utf8 with default lang
 				array('username_clean',			'users.username',					array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')),
-				array('user_password',			'users.user_password',				'phpbb_hash'),
-				array('user_pass_convert',		1,									''),
+				array('user_password',			'users.user_password',				'phpbb_convert_password_hash'),
 				array('user_posts',				'users.user_posts',					'intval'),
 				array('user_email',				'users.user_email',					'strtolower'),
 				array('user_email_hash',		'users.user_email',					'gen_email_hash'),
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 01447a6232..817c007274 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1969,3 +1969,13 @@ function phpbb_add_notification_options($user_notify_pm)
 
 	$sql = $db->sql_multi_insert(USER_NOTIFICATIONS_TABLE, $rows);
 }
+
+function phpbb_convert_password_hash($hash)
+{
+	global $phpbb_container;
+
+	$manager = $phpbb_container->get('passwords.manager');
+	$hash = $manager->hash($hash, '$H$');
+
+	return '$CP$' . $hash;
+}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6a91033dbb..5cf01fec79 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -177,11 +177,21 @@ $migrator = $phpbb_container->get('migrator');
 $migrator->create_migrations_table();
 
 $phpbb_extension_manager = $phpbb_container->get('ext.manager');
-$finder = $phpbb_extension_manager->get_finder();
 
-$migrations = $finder
+$migrations = $phpbb_extension_manager
+	->get_finder()
 	->core_path('phpbb/db/migration/data/')
+	->extension_directory('/migration')
 	->get_classes();
+
+// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
+$migrations_deprecated = $phpbb_extension_manager
+	->get_finder()
+	->extension_directory('/migrations')
+	->get_classes();
+
+$migrations = array_merge($migrations, $migrations_deprecated);
+
 $migrator->set_migrations($migrations);
 
 // What is a safe limit of execution time? Half the max execution time should be safe.
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 2e497da3db..5531a98c09 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -445,7 +445,7 @@ class module
 
 		header('Content-type: text/html; charset=UTF-8');
 		header('Cache-Control: private, no-cache="set-cookie"');
-		header('Expires: 0');
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 		header('Pragma: no-cache');
 
 		return;