3 files changed, 75 insertions, 5 deletions
diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php
index 6517954dfe..c867b9262e 100644
--- a/phpBB/develop/benchmark.php
+++ b/phpBB/develop/benchmark.php
@@ -377,6 +377,7 @@ function make_user($username)
 	$viewemail = 0;
 	$aim = 0;
 	$yim = 0;
+	$msn = 0;
 	$attachsig = 1;
 	$allowsmilies = 1;
 	$allowhtml = 1;
@@ -421,8 +422,8 @@ function make_user($username)
 	}
 
 
-	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
-		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
+	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
+		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
 
 	
 	$sql .= "1, '')";
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index c6012a633f..b454fb2c16 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -998,6 +998,14 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_config_text'] = array(
+		'COLUMNS'		=> array(
+			'config_name'		=> array('VCHAR', ''),
+			'config_value'		=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'config_name',
+	);
+
 	$schema_data['phpbb_confirm'] = array(
 		'COLUMNS'		=> array(
 			'confirm_id'		=> array('CHAR:32', ''),
@@ -1168,7 +1176,7 @@ function get_schema_struct()
 			'group_desc_uid'		=> array('VCHAR:8', ''),
 			'group_display'			=> array('BOOL', 0),
 			'group_avatar'			=> array('VCHAR', ''),
-			'group_avatar_type'		=> array('TINT:2', 0),
+			'group_avatar_type'		=> array('VCHAR:255', ''),
 			'group_avatar_width'	=> array('USINT', 0),
 			'group_avatar_height'	=> array('USINT', 0),
 			'group_rank'			=> array('UINT', 0),
@@ -1178,7 +1186,6 @@ function get_schema_struct()
 			'group_message_limit'	=> array('UINT', 0),
 			'group_max_recipients'	=> array('UINT', 0),
 			'group_legend'			=> array('UINT', 0),
-			'group_teampage'		=> array('UINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'group_id',
 		'KEYS'			=> array(
@@ -1273,6 +1280,19 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_migrations'] = array(
+		'COLUMNS'		=> array(
+			'migration_name'			=> array('VCHAR', ''),
+			'migration_depends_on'		=> array('TEXT', ''),
+			'migration_schema_done'		=> array('BOOL', 0),
+			'migration_data_done'		=> array('BOOL', 0),
+			'migration_data_state'		=> array('TEXT', ''),
+			'migration_start_time'		=> array('TIMESTAMP', 0),
+			'migration_end_time'		=> array('TIMESTAMP', 0),
+		),
+		'PRIMARY_KEY'	=> 'migration_name',
+	);
+
 	$schema_data['phpbb_modules'] = array(
 		'COLUMNS'		=> array(
 			'module_id'				=> array('UINT', NULL, 'auto_increment'),
@@ -1295,6 +1315,32 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_notification_types'] = array(
+		'COLUMNS'			=> array(
+			'notification_type'			=> array('VCHAR:255', ''),
+			'notification_type_enabled'	=> array('BOOL', 1),
+		),
+		'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+	);
+
+	$schema_data['phpbb_notifications'] = array(
+		'COLUMNS'			=> array(
+			'notification_id'				=> array('UINT', NULL, 'auto_increment'),
+			'item_type'			   			=> array('VCHAR:255', ''),
+			'item_id'						=> array('UINT', 0),
+			'item_parent_id'				=> array('UINT', 0),
+			'user_id'						=> array('UINT', 0),
+			'notification_read'				=> array('BOOL', 0),
+			'notification_time'				=> array('TIMESTAMP', 1),
+			'notification_data'				=> array('TEXT_UNI', ''),
+		),
+		'PRIMARY_KEY'		=> 'notification_id',
+		'KEYS'				=> array(
+			'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+			'user'				=> array('INDEX', array('user_id', 'notification_read')),
+		),
+	);
+
 	$schema_data['phpbb_poll_options'] = array(
 		'COLUMNS'		=> array(
 			'poll_option_id'		=> array('TINT:4', 0),
@@ -1672,6 +1718,17 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_teampage'] = array(
+		'COLUMNS'		=> array(
+			'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
+			'group_id'			=> array('UINT', 0),
+			'teampage_name'		=> array('VCHAR_UNI:255', ''),
+			'teampage_position'	=> array('UINT', 0),
+			'teampage_parent'	=> array('UINT', 0),
+		),
+		'PRIMARY_KEY'	=> 'teampage_id',
+	);
+
 	$schema_data['phpbb_topics'] = array(
 		'COLUMNS'		=> array(
 			'topic_id'					=> array('UINT', NULL, 'auto_increment'),
@@ -1756,6 +1813,16 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_user_notifications'] = array(
+		'COLUMNS'			=> array(
+			'item_type'			=> array('VCHAR:255', ''),
+			'item_id'			=> array('UINT', 0),
+			'user_id'			=> array('UINT', 0),
+			'method'			=> array('VCHAR:255', ''),
+			'notify'			=> array('BOOL', 1),
+		),
+	);
+
 	$schema_data['phpbb_user_group'] = array(
 		'COLUMNS'		=> array(
 			'group_id'			=> array('UINT', 0),
@@ -1826,7 +1893,7 @@ function get_schema_struct()
 			'user_allow_massemail'		=> array('BOOL', 1),
 			'user_options'				=> array('UINT:11', 230271),
 			'user_avatar'				=> array('VCHAR', ''),
-			'user_avatar_type'			=> array('TINT:2', 0),
+			'user_avatar_type'			=> array('VCHAR:255', ''),
 			'user_avatar_width'			=> array('USINT', 0),
 			'user_avatar_height'		=> array('USINT', 0),
 			'user_sig'					=> array('MTEXT_UNI', ''),
@@ -1836,6 +1903,7 @@ function get_schema_struct()
 			'user_icq'					=> array('VCHAR:15', ''),
 			'user_aim'					=> array('VCHAR_UNI', ''),
 			'user_yim'					=> array('VCHAR_UNI', ''),
+			'user_msnm'					=> array('VCHAR_UNI', ''),
 			'user_jabber'				=> array('VCHAR_UNI', ''),
 			'user_website'				=> array('VCHAR_UNI:200', ''),
 			'user_occ'					=> array('TEXT_UNI', ''),
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index ca738aabf6..7f82ebfeab 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -1265,6 +1265,7 @@ function get_schema_struct()
 			'user_icq'					=> array('VCHAR:15', ''),
 			'user_aim'					=> array('VCHAR_UNI', ''),
 			'user_yim'					=> array('VCHAR_UNI', ''),
+			'user_msnm'					=> array('VCHAR_UNI', ''),
 			'user_jabber'				=> array('VCHAR_UNI', ''),
 			'user_website'				=> array('VCHAR_UNI:200', ''),
 			'user_occ'					=> array('TEXT_UNI', ''),