2 files changed, 21 insertions, 11 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index dd4ef13e49..926f139da4 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -33,7 +33,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.1.0-a2',
+	'phpbb_version'	=> '3.1.0-b2',
 	'author'		=> '<a href="https://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
@@ -906,15 +906,7 @@ if (!$get_info)
 				array('user_inactive_reason',	'',									'phpbb_inactive_reason'),
 				array('user_inactive_time',		'',									'phpbb_inactive_time'),
 
-				array('user_interests',			'users.user_interests',				array('function1' => 'phpbb_set_encoding')),
-				array('user_occ',				'users.user_occ',					array('function1' => 'phpbb_set_encoding')),
-				array('user_website',			'users.user_website',				'validate_website'),
 				array('user_jabber',			'',									''),
-				array('user_msnm',				'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),
-				array('user_yim',				'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
-				array('user_aim',				'users.user_aim',					array('function1' => 'phpbb_set_encoding')),
-				array('user_icq',				'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
-				array('user_from',				'users.user_from',					array('function1' => 'phpbb_set_encoding')),
 				array('user_rank',				'users.user_rank',					'intval'),
 				array('user_permissions',		'',									''),
 
@@ -954,6 +946,26 @@ if (!$get_info)
 
 				'where'			=> 'users.user_id <> -1',
 			),
+
+			array(
+				'target'		=> PROFILE_FIELDS_DATA_TABLE,
+				'primary'		=> 'users.user_id',
+				'query_first'	=> array(
+					array('target', $convert->truncate_statement . PROFILE_FIELDS_DATA_TABLE),
+				),
+
+				array('user_id',				'users.user_id',					'phpbb_user_id'),
+				array('pf_phpbb_occupation',	'users.user_occ',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_interests',		'users.user_interests',				array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_location',		'users.user_from',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_icq',			'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_wlm',			'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_yahoo',			'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_aol',			'users.user_aim',					array('function1' => 'phpbb_set_encoding')),
+				array('pf_phpbb_website',		'users.user_website',				'validate_website'),
+
+				'where'			=> 'users.user_id <> -1',
+			),
 		),
 	);
 }
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 29e5f7ab09..f3b8c82131 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -71,7 +71,6 @@ function phpbb_insert_forums()
 	$prune_enabled = (int) $src_db->sql_fetchfield('config_value');
 	$src_db->sql_freeresult($result);
 
-
 	// Insert categories
 	$sql = 'SELECT cat_id, cat_title
 		FROM ' . $convert->src_table_prefix . 'categories
@@ -571,7 +570,6 @@ function phpbb_convert_authentication($mode)
 		// What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x.
 		// After conversion the main admin need to make sure he is removing permissions and the founder status if wanted.
 
-
 		// Grab user ids of users with user_level of ADMIN
 		$sql = "SELECT user_id
 			FROM {$convert->src_table_prefix}users