14 files changed, 153 insertions, 1349 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index fe23ed5a9a..11bbcd4154 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.0-b2-dev');
+define('PHPBB_VERSION', '3.1.0-b3-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/includes/db/index.htm b/phpBB/includes/db/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/includes/db/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php
deleted file mode 100644
index 1a08149f66..0000000000
--- a/phpBB/includes/db/schema_data.php
+++ /dev/null
@@ -1,1223 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$schema_data = array();
-
-/**
-* Define the basic structure
-* The format:
-*		array('{TABLE_NAME}' => {TABLE_DATA})
-*		{TABLE_DATA}:
-*			COLUMNS = array({column_name} = array({column_type}, {default}, {auto_increment}))
-*			PRIMARY_KEY = {column_name(s)}
-*			KEYS = array({key_name} = array({key_type}, {column_name(s)})),
-*
-*	Column Types:
-*	INT:x		=> SIGNED int(x)
-*	BINT		=> BIGINT
-*	UINT		=> mediumint(8) UNSIGNED
-*	UINT:x		=> int(x) UNSIGNED
-*	TINT:x		=> tinyint(x)
-*	USINT		=> smallint(4) UNSIGNED (for _order columns)
-*	BOOL		=> tinyint(1) UNSIGNED
-*	VCHAR		=> varchar(255)
-*	CHAR:x		=> char(x)
-*	XSTEXT_UNI	=> text for storing 100 characters (topic_title for example)
-*	STEXT_UNI	=> text for storing 255 characters (normal input field with a max of 255 single-byte chars) - same as VCHAR_UNI
-*	TEXT_UNI	=> text for storing 3000 characters (short text, descriptions, comments, etc.)
-*	MTEXT_UNI	=> mediumtext (post text, large text)
-*	VCHAR:x		=> varchar(x)
-*	TIMESTAMP	=> int(11) UNSIGNED
-*	DECIMAL		=> decimal number (5,2)
-*	DECIMAL:	=> decimal number (x,2)
-*	PDECIMAL	=> precision decimal number (6,3)
-*	PDECIMAL:	=> precision decimal number (x,3)
-*	VCHAR_UNI	=> varchar(255) BINARY
-*	VCHAR_CI	=> varchar_ci for postgresql, others VCHAR
-*/
-$schema_data['phpbb_attachments'] = array(
-	'COLUMNS'		=> array(
-		'attach_id'			=> array('UINT', NULL, 'auto_increment'),
-		'post_msg_id'		=> array('UINT', 0),
-		'topic_id'			=> array('UINT', 0),
-		'in_message'		=> array('BOOL', 0),
-		'poster_id'			=> array('UINT', 0),
-		'is_orphan'			=> array('BOOL', 1),
-		'physical_filename'	=> array('VCHAR', ''),
-		'real_filename'		=> array('VCHAR', ''),
-		'download_count'	=> array('UINT', 0),
-		'attach_comment'	=> array('TEXT_UNI', ''),
-		'extension'			=> array('VCHAR:100', ''),
-		'mimetype'			=> array('VCHAR:100', ''),
-		'filesize'			=> array('UINT:20', 0),
-		'filetime'			=> array('TIMESTAMP', 0),
-		'thumbnail'			=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> 'attach_id',
-	'KEYS'			=> array(
-		'filetime'			=> array('INDEX', 'filetime'),
-		'post_msg_id'		=> array('INDEX', 'post_msg_id'),
-		'topic_id'			=> array('INDEX', 'topic_id'),
-		'poster_id'			=> array('INDEX', 'poster_id'),
-		'is_orphan'			=> array('INDEX', 'is_orphan'),
-	),
-);
-
-$schema_data['phpbb_acl_groups'] = array(
-	'COLUMNS'		=> array(
-		'group_id'			=> array('UINT', 0),
-		'forum_id'			=> array('UINT', 0),
-		'auth_option_id'	=> array('UINT', 0),
-		'auth_role_id'		=> array('UINT', 0),
-		'auth_setting'		=> array('TINT:2', 0),
-	),
-	'KEYS'			=> array(
-		'group_id'		=> array('INDEX', 'group_id'),
-		'auth_opt_id'	=> array('INDEX', 'auth_option_id'),
-		'auth_role_id'	=> array('INDEX', 'auth_role_id'),
-	),
-);
-
-$schema_data['phpbb_acl_options'] = array(
-	'COLUMNS'		=> array(
-		'auth_option_id'	=> array('UINT', NULL, 'auto_increment'),
-		'auth_option'		=> array('VCHAR:50', ''),
-		'is_global'			=> array('BOOL', 0),
-		'is_local'			=> array('BOOL', 0),
-		'founder_only'		=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> 'auth_option_id',
-	'KEYS'			=> array(
-		'auth_option'		=> array('UNIQUE', 'auth_option'),
-	),
-);
-
-$schema_data['phpbb_acl_roles'] = array(
-	'COLUMNS'		=> array(
-		'role_id'			=> array('UINT', NULL, 'auto_increment'),
-		'role_name'			=> array('VCHAR_UNI', ''),
-		'role_description'	=> array('TEXT_UNI', ''),
-		'role_type'			=> array('VCHAR:10', ''),
-		'role_order'		=> array('USINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'role_id',
-	'KEYS'			=> array(
-		'role_type'			=> array('INDEX', 'role_type'),
-		'role_order'		=> array('INDEX', 'role_order'),
-	),
-);
-
-$schema_data['phpbb_acl_roles_data'] = array(
-	'COLUMNS'		=> array(
-		'role_id'			=> array('UINT', 0),
-		'auth_option_id'	=> array('UINT', 0),
-		'auth_setting'		=> array('TINT:2', 0),
-	),
-	'PRIMARY_KEY'	=> array('role_id', 'auth_option_id'),
-	'KEYS'			=> array(
-		'ath_op_id'			=> array('INDEX', 'auth_option_id'),
-	),
-);
-
-$schema_data['phpbb_acl_users'] = array(
-	'COLUMNS'		=> array(
-		'user_id'			=> array('UINT', 0),
-		'forum_id'			=> array('UINT', 0),
-		'auth_option_id'	=> array('UINT', 0),
-		'auth_role_id'		=> array('UINT', 0),
-		'auth_setting'		=> array('TINT:2', 0),
-	),
-	'KEYS'			=> array(
-		'user_id'			=> array('INDEX', 'user_id'),
-		'auth_option_id'	=> array('INDEX', 'auth_option_id'),
-		'auth_role_id'		=> array('INDEX', 'auth_role_id'),
-	),
-);
-
-$schema_data['phpbb_banlist'] = array(
-	'COLUMNS'		=> array(
-		'ban_id'			=> array('UINT', NULL, 'auto_increment'),
-		'ban_userid'		=> array('UINT', 0),
-		'ban_ip'			=> array('VCHAR:40', ''),
-		'ban_email'			=> array('VCHAR_UNI:100', ''),
-		'ban_start'			=> array('TIMESTAMP', 0),
-		'ban_end'			=> array('TIMESTAMP', 0),
-		'ban_exclude'		=> array('BOOL', 0),
-		'ban_reason'		=> array('VCHAR_UNI', ''),
-		'ban_give_reason'	=> array('VCHAR_UNI', ''),
-	),
-	'PRIMARY_KEY'			=> 'ban_id',
-	'KEYS'			=> array(
-		'ban_end'			=> array('INDEX', 'ban_end'),
-		'ban_user'			=> array('INDEX', array('ban_userid', 'ban_exclude')),
-		'ban_email'			=> array('INDEX', array('ban_email', 'ban_exclude')),
-		'ban_ip'			=> array('INDEX', array('ban_ip', 'ban_exclude')),
-	),
-);
-
-$schema_data['phpbb_bbcodes'] = array(
-	'COLUMNS'		=> array(
-		'bbcode_id'				=> array('USINT', 0),
-		'bbcode_tag'			=> array('VCHAR:16', ''),
-		'bbcode_helpline'		=> array('VCHAR_UNI', ''),
-		'display_on_posting'	=> array('BOOL', 0),
-		'bbcode_match'			=> array('TEXT_UNI', ''),
-		'bbcode_tpl'			=> array('MTEXT_UNI', ''),
-		'first_pass_match'		=> array('MTEXT_UNI', ''),
-		'first_pass_replace'	=> array('MTEXT_UNI', ''),
-		'second_pass_match'		=> array('MTEXT_UNI', ''),
-		'second_pass_replace'	=> array('MTEXT_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> 'bbcode_id',
-	'KEYS'			=> array(
-		'display_on_post'		=> array('INDEX', 'display_on_posting'),
-	),
-);
-
-$schema_data['phpbb_bookmarks'] = array(
-	'COLUMNS'		=> array(
-		'topic_id'			=> array('UINT', 0),
-		'user_id'			=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'			=> array('topic_id', 'user_id'),
-);
-
-$schema_data['phpbb_bots'] = array(
-	'COLUMNS'		=> array(
-		'bot_id'			=> array('UINT', NULL, 'auto_increment'),
-		'bot_active'		=> array('BOOL', 1),
-		'bot_name'			=> array('STEXT_UNI', ''),
-		'user_id'			=> array('UINT', 0),
-		'bot_agent'			=> array('VCHAR', ''),
-		'bot_ip'			=> array('VCHAR', ''),
-	),
-	'PRIMARY_KEY'	=> 'bot_id',
-	'KEYS'			=> array(
-		'bot_active'		=> array('INDEX', 'bot_active'),
-	),
-);
-
-$schema_data['phpbb_config'] = array(
-	'COLUMNS'		=> array(
-		'config_name'		=> array('VCHAR', ''),
-		'config_value'		=> array('VCHAR_UNI', ''),
-		'is_dynamic'		=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> 'config_name',
-	'KEYS'			=> array(
-		'is_dynamic'		=> array('INDEX', 'is_dynamic'),
-	),
-);
-
-$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', ''),
-		'session_id'		=> array('CHAR:32', ''),
-		'confirm_type'		=> array('TINT:3', 0),
-		'code'				=> array('VCHAR:8', ''),
-		'seed'				=> array('UINT:10', 0),
-		'attempts'			=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> array('session_id', 'confirm_id'),
-	'KEYS'			=> array(
-		'confirm_type'		=> array('INDEX', 'confirm_type'),
-	),
-);
-
-$schema_data['phpbb_disallow'] = array(
-	'COLUMNS'		=> array(
-		'disallow_id'		=> array('UINT', NULL, 'auto_increment'),
-		'disallow_username'	=> array('VCHAR_UNI:255', ''),
-	),
-	'PRIMARY_KEY'	=> 'disallow_id',
-);
-
-$schema_data['phpbb_drafts'] = array(
-	'COLUMNS'		=> array(
-		'draft_id'			=> array('UINT', NULL, 'auto_increment'),
-		'user_id'			=> array('UINT', 0),
-		'topic_id'			=> array('UINT', 0),
-		'forum_id'			=> array('UINT', 0),
-		'save_time'			=> array('TIMESTAMP', 0),
-		'draft_subject'		=> array('STEXT_UNI', ''),
-		'draft_message'		=> array('MTEXT_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> 'draft_id',
-	'KEYS'			=> array(
-		'save_time'			=> array('INDEX', 'save_time'),
-	),
-);
-
-$schema_data['phpbb_ext'] = array(
-	'COLUMNS'		=> array(
-		'ext_name'				=> array('VCHAR', ''),
-		'ext_active'			=> array('BOOL', 0),
-		'ext_state'				=> array('TEXT', ''),
-	),
-	'KEYS'			=> array(
-		'ext_name'				=> array('UNIQUE', 'ext_name'),
-	),
-);
-
-$schema_data['phpbb_extensions'] = array(
-	'COLUMNS'		=> array(
-		'extension_id'		=> array('UINT', NULL, 'auto_increment'),
-		'group_id'			=> array('UINT', 0),
-		'extension'			=> array('VCHAR:100', ''),
-	),
-	'PRIMARY_KEY'	=> 'extension_id',
-);
-
-$schema_data['phpbb_extension_groups'] = array(
-	'COLUMNS'		=> array(
-		'group_id'			=> array('UINT', NULL, 'auto_increment'),
-		'group_name'		=> array('VCHAR_UNI', ''),
-		'cat_id'			=> array('TINT:2', 0),
-		'allow_group'		=> array('BOOL', 0),
-		'download_mode'		=> array('BOOL', 1),
-		'upload_icon'		=> array('VCHAR', ''),
-		'max_filesize'		=> array('UINT:20', 0),
-		'allowed_forums'	=> array('TEXT', ''),
-		'allow_in_pm'		=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> 'group_id',
-);
-
-$schema_data['phpbb_forums'] = array(
-	'COLUMNS'		=> array(
-		'forum_id'				=> array('UINT', NULL, 'auto_increment'),
-		'parent_id'				=> array('UINT', 0),
-		'left_id'				=> array('UINT', 0),
-		'right_id'				=> array('UINT', 0),
-		'forum_parents'			=> array('MTEXT', ''),
-		'forum_name'			=> array('STEXT_UNI', ''),
-		'forum_desc'			=> array('TEXT_UNI', ''),
-		'forum_desc_bitfield'	=> array('VCHAR:255', ''),
-		'forum_desc_options'	=> array('UINT:11', 7),
-		'forum_desc_uid'		=> array('VCHAR:8', ''),
-		'forum_link'			=> array('VCHAR_UNI', ''),
-		'forum_password'		=> array('VCHAR_UNI', ''),
-		'forum_style'			=> array('UINT', 0),
-		'forum_image'			=> array('VCHAR', ''),
-		'forum_rules'			=> array('TEXT_UNI', ''),
-		'forum_rules_link'		=> array('VCHAR_UNI', ''),
-		'forum_rules_bitfield'	=> array('VCHAR:255', ''),
-		'forum_rules_options'	=> array('UINT:11', 7),
-		'forum_rules_uid'		=> array('VCHAR:8', ''),
-		'forum_topics_per_page'	=> array('TINT:4', 0),
-		'forum_type'			=> array('TINT:4', 0),
-		'forum_status'			=> array('TINT:4', 0),
-		'forum_posts_approved'		=> array('UINT', 0),
-		'forum_posts_unapproved'	=> array('UINT', 0),
-		'forum_posts_softdeleted'	=> array('UINT', 0),
-		'forum_topics_approved'		=> array('UINT', 0),
-		'forum_topics_unapproved'	=> array('UINT', 0),
-		'forum_topics_softdeleted'	=> array('UINT', 0),
-		'forum_last_post_id'	=> array('UINT', 0),
-		'forum_last_poster_id'	=> array('UINT', 0),
-		'forum_last_post_subject' => array('STEXT_UNI', ''),
-		'forum_last_post_time'	=> array('TIMESTAMP', 0),
-		'forum_last_poster_name'=> array('VCHAR_UNI', ''),
-		'forum_last_poster_colour'=> array('VCHAR:6', ''),
-		'forum_flags'			=> array('TINT:4', 32),
-		'forum_options'			=> array('UINT:20', 0),
-		'display_subforum_list'	=> array('BOOL', 1),
-		'display_on_index'		=> array('BOOL', 1),
-		'enable_indexing'		=> array('BOOL', 1),
-		'enable_icons'			=> array('BOOL', 1),
-		'enable_prune'			=> array('BOOL', 0),
-		'prune_next'			=> array('TIMESTAMP', 0),
-		'prune_days'			=> array('UINT', 0),
-		'prune_viewed'			=> array('UINT', 0),
-		'prune_freq'			=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'forum_id',
-	'KEYS'			=> array(
-		'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
-		'forum_lastpost_id'		=> array('INDEX', 'forum_last_post_id'),
-	),
-);
-
-$schema_data['phpbb_forums_access'] = array(
-	'COLUMNS'		=> array(
-		'forum_id'				=> array('UINT', 0),
-		'user_id'				=> array('UINT', 0),
-		'session_id'			=> array('CHAR:32', ''),
-	),
-	'PRIMARY_KEY'	=> array('forum_id', 'user_id', 'session_id'),
-);
-
-$schema_data['phpbb_forums_track'] = array(
-	'COLUMNS'		=> array(
-		'user_id'				=> array('UINT', 0),
-		'forum_id'				=> array('UINT', 0),
-		'mark_time'				=> array('TIMESTAMP', 0),
-	),
-	'PRIMARY_KEY'	=> array('user_id', 'forum_id'),
-);
-
-$schema_data['phpbb_forums_watch'] = array(
-	'COLUMNS'		=> array(
-		'forum_id'				=> array('UINT', 0),
-		'user_id'				=> array('UINT', 0),
-		'notify_status'			=> array('BOOL', 0),
-	),
-	'KEYS'			=> array(
-		'forum_id'				=> array('INDEX', 'forum_id'),
-		'user_id'				=> array('INDEX', 'user_id'),
-		'notify_stat'			=> array('INDEX', 'notify_status'),
-	),
-);
-
-$schema_data['phpbb_groups'] = array(
-	'COLUMNS'		=> array(
-		'group_id'				=> array('UINT', NULL, 'auto_increment'),
-		'group_type'			=> array('TINT:4', 1),
-		'group_founder_manage'	=> array('BOOL', 0),
-		'group_skip_auth'		=> array('BOOL', 0),
-		'group_name'			=> array('VCHAR_CI', ''),
-		'group_desc'			=> array('TEXT_UNI', ''),
-		'group_desc_bitfield'	=> array('VCHAR:255', ''),
-		'group_desc_options'	=> array('UINT:11', 7),
-		'group_desc_uid'		=> array('VCHAR:8', ''),
-		'group_display'			=> array('BOOL', 0),
-		'group_avatar'			=> array('VCHAR', ''),
-		'group_avatar_type'		=> array('VCHAR:255', ''),
-		'group_avatar_width'	=> array('USINT', 0),
-		'group_avatar_height'	=> array('USINT', 0),
-		'group_rank'			=> array('UINT', 0),
-		'group_colour'			=> array('VCHAR:6', ''),
-		'group_sig_chars'		=> array('UINT', 0),
-		'group_receive_pm'		=> array('BOOL', 0),
-		'group_message_limit'	=> array('UINT', 0),
-		'group_max_recipients'	=> array('UINT', 0),
-		'group_legend'			=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'group_id',
-	'KEYS'			=> array(
-		'group_legend_name'		=> array('INDEX', array('group_legend', 'group_name')),
-	),
-);
-
-$schema_data['phpbb_icons'] = array(
-	'COLUMNS'		=> array(
-		'icons_id'				=> array('UINT', NULL, 'auto_increment'),
-		'icons_url'				=> array('VCHAR', ''),
-		'icons_width'			=> array('TINT:4', 0),
-		'icons_height'			=> array('TINT:4', 0),
-		'icons_order'			=> array('UINT', 0),
-		'display_on_posting'	=> array('BOOL', 1),
-	),
-	'PRIMARY_KEY'	=> 'icons_id',
-	'KEYS'			=> array(
-		'display_on_posting'	=> array('INDEX', 'display_on_posting'),
-	),
-);
-
-$schema_data['phpbb_lang'] = array(
-	'COLUMNS'		=> array(
-		'lang_id'				=> array('TINT:4', NULL, 'auto_increment'),
-		'lang_iso'				=> array('VCHAR:30', ''),
-		'lang_dir'				=> array('VCHAR:30', ''),
-		'lang_english_name'		=> array('VCHAR_UNI:100', ''),
-		'lang_local_name'		=> array('VCHAR_UNI:255', ''),
-		'lang_author'			=> array('VCHAR_UNI:255', ''),
-	),
-	'PRIMARY_KEY'	=> 'lang_id',
-	'KEYS'			=> array(
-		'lang_iso'				=> array('INDEX', 'lang_iso'),
-	),
-);
-
-$schema_data['phpbb_log'] = array(
-	'COLUMNS'		=> array(
-		'log_id'				=> array('UINT', NULL, 'auto_increment'),
-		'log_type'				=> array('TINT:4', 0),
-		'user_id'				=> array('UINT', 0),
-		'forum_id'				=> array('UINT', 0),
-		'topic_id'				=> array('UINT', 0),
-		'reportee_id'			=> array('UINT', 0),
-		'log_ip'				=> array('VCHAR:40', ''),
-		'log_time'				=> array('TIMESTAMP', 0),
-		'log_operation'			=> array('TEXT_UNI', ''),
-		'log_data'				=> array('MTEXT_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> 'log_id',
-	'KEYS'			=> array(
-		'log_type'				=> array('INDEX', 'log_type'),
-		'log_time'				=> array('INDEX', 'log_time'),
-		'forum_id'				=> array('INDEX', 'forum_id'),
-		'topic_id'				=> array('INDEX', 'topic_id'),
-		'reportee_id'			=> array('INDEX', 'reportee_id'),
-		'user_id'				=> array('INDEX', 'user_id'),
-	),
-);
-
-$schema_data['phpbb_login_attempts'] = array(
-	'COLUMNS'		=> array(
-		'attempt_ip'			=> array('VCHAR:40', ''),
-		'attempt_browser'		=> array('VCHAR:150', ''),
-		'attempt_forwarded_for'	=> array('VCHAR:255', ''),
-		'attempt_time'			=> array('TIMESTAMP', 0),
-		'user_id'				=> array('UINT', 0),
-		'username'				=> array('VCHAR_UNI:255', 0),
-		'username_clean'		=> array('VCHAR_CI', 0),
-	),
-	'KEYS'			=> array(
-		'att_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
-		'att_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-		'att_time'				=> array('INDEX', array('attempt_time')),
-		'user_id'					=> array('INDEX', 'user_id'),
-	),
-);
-
-$schema_data['phpbb_moderator_cache'] = array(
-	'COLUMNS'		=> array(
-		'forum_id'				=> array('UINT', 0),
-		'user_id'				=> array('UINT', 0),
-		'username'				=> array('VCHAR_UNI:255', ''),
-		'group_id'				=> array('UINT', 0),
-		'group_name'			=> array('VCHAR_UNI', ''),
-		'display_on_index'		=> array('BOOL', 1),
-	),
-	'KEYS'			=> array(
-		'disp_idx'				=> array('INDEX', 'display_on_index'),
-		'forum_id'				=> array('INDEX', 'forum_id'),
-	),
-);
-
-$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'),
-		'module_enabled'		=> array('BOOL', 1),
-		'module_display'		=> array('BOOL', 1),
-		'module_basename'		=> array('VCHAR', ''),
-		'module_class'			=> array('VCHAR:10', ''),
-		'parent_id'				=> array('UINT', 0),
-		'left_id'				=> array('UINT', 0),
-		'right_id'				=> array('UINT', 0),
-		'module_langname'		=> array('VCHAR', ''),
-		'module_mode'			=> array('VCHAR', ''),
-		'module_auth'			=> array('VCHAR', ''),
-	),
-	'PRIMARY_KEY'	=> 'module_id',
-	'KEYS'			=> array(
-		'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
-		'module_enabled'		=> array('INDEX', 'module_enabled'),
-		'class_left_id'			=> array('INDEX', array('module_class', 'left_id')),
-	),
-);
-
-$schema_data['phpbb_notification_types'] = array(
-	'COLUMNS'			=> array(
-		'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
-		'notification_type_name'	=> array('VCHAR:255', ''),
-		'notification_type_enabled'	=> array('BOOL', 1),
-	),
-	'PRIMARY_KEY'		=> array('notification_type_id'),
-	'KEYS'				=> array(
-		'type'			=> array('UNIQUE', array('notification_type_name')),
-	),
-);
-
-$schema_data['phpbb_notifications'] = array(
-	'COLUMNS'			=> array(
-		'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
-		'notification_type_id'			=> array('USINT', 0),
-		'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('notification_type_id', 'item_id')),
-		'user'				=> array('INDEX', array('user_id', 'notification_read')),
-	),
-);
-
-$schema_data['phpbb_oauth_accounts'] = array(
-	'COLUMNS' => array(
-		'user_id'			=> array('UINT', 0),
-		'provider'			=> array('VCHAR', ''),
-		'oauth_provider_id'	=> array('TEXT_UNI', ''),
-	),
-	'PRIMARY_KEY' => array(
-		'user_id',
-		'provider',
-	),
-);
-
-$schema_data['phpbb_oauth_tokens'] = array(
-	'COLUMNS' => array(
-		'user_id'			=> array('UINT', 0), // phpbb_users.user_id
-		'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
-		'provider'			=> array('VCHAR', ''), // Name of the OAuth provider
-		'oauth_token'		=> array('MTEXT', ''), // Serialized token
-	),
-	'KEYS' => array(
-		'user_id'			=> array('INDEX', 'user_id'),
-		'provider'			=> array('INDEX', 'provider'),
-	),
-);
-
-$schema_data['phpbb_poll_options'] = array(
-	'COLUMNS'		=> array(
-		'poll_option_id'		=> array('TINT:4', 0),
-		'topic_id'				=> array('UINT', 0),
-		'poll_option_text'		=> array('TEXT_UNI', ''),
-		'poll_option_total'		=> array('UINT', 0),
-	),
-	'KEYS'			=> array(
-		'poll_opt_id'			=> array('INDEX', 'poll_option_id'),
-		'topic_id'				=> array('INDEX', 'topic_id'),
-	),
-);
-
-$schema_data['phpbb_poll_votes'] = array(
-	'COLUMNS'		=> array(
-		'topic_id'				=> array('UINT', 0),
-		'poll_option_id'		=> array('TINT:4', 0),
-		'vote_user_id'			=> array('UINT', 0),
-		'vote_user_ip'			=> array('VCHAR:40', ''),
-	),
-	'KEYS'			=> array(
-		'topic_id'				=> array('INDEX', 'topic_id'),
-		'vote_user_id'			=> array('INDEX', 'vote_user_id'),
-		'vote_user_ip'			=> array('INDEX', 'vote_user_ip'),
-	),
-);
-
-$schema_data['phpbb_posts'] = array(
-	'COLUMNS'		=> array(
-		'post_id'				=> array('UINT', NULL, 'auto_increment'),
-		'topic_id'				=> array('UINT', 0),
-		'forum_id'				=> array('UINT', 0),
-		'poster_id'				=> array('UINT', 0),
-		'icon_id'				=> array('UINT', 0),
-		'poster_ip'				=> array('VCHAR:40', ''),
-		'post_time'				=> array('TIMESTAMP', 0),
-		'post_visibility'		=> array('TINT:3', 0),
-		'post_reported'			=> array('BOOL', 0),
-		'enable_bbcode'			=> array('BOOL', 1),
-		'enable_smilies'		=> array('BOOL', 1),
-		'enable_magic_url'		=> array('BOOL', 1),
-		'enable_sig'			=> array('BOOL', 1),
-		'post_username'			=> array('VCHAR_UNI:255', ''),
-		'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
-		'post_text'				=> array('MTEXT_UNI', ''),
-		'post_checksum'			=> array('VCHAR:32', ''),
-		'post_attachment'		=> array('BOOL', 0),
-		'bbcode_bitfield'		=> array('VCHAR:255', ''),
-		'bbcode_uid'			=> array('VCHAR:8', ''),
-		'post_postcount'		=> array('BOOL', 1),
-		'post_edit_time'		=> array('TIMESTAMP', 0),
-		'post_edit_reason'		=> array('STEXT_UNI', ''),
-		'post_edit_user'		=> array('UINT', 0),
-		'post_edit_count'		=> array('USINT', 0),
-		'post_edit_locked'		=> array('BOOL', 0),
-		'post_delete_time'		=> array('TIMESTAMP', 0),
-		'post_delete_reason'	=> array('STEXT_UNI', ''),
-		'post_delete_user'		=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'post_id',
-	'KEYS'			=> array(
-		'forum_id'				=> array('INDEX', 'forum_id'),
-		'topic_id'				=> array('INDEX', 'topic_id'),
-		'poster_ip'				=> array('INDEX', 'poster_ip'),
-		'poster_id'				=> array('INDEX', 'poster_id'),
-		'post_visibility'		=> array('INDEX', 'post_visibility'),
-		'post_username'			=> array('INDEX', 'post_username'),
-		'tid_post_time'			=> array('INDEX', array('topic_id', 'post_time')),
-	),
-);
-
-$schema_data['phpbb_privmsgs'] = array(
-	'COLUMNS'		=> array(
-		'msg_id'				=> array('UINT', NULL, 'auto_increment'),
-		'root_level'			=> array('UINT', 0),
-		'author_id'				=> array('UINT', 0),
-		'icon_id'				=> array('UINT', 0),
-		'author_ip'				=> array('VCHAR:40', ''),
-		'message_time'			=> array('TIMESTAMP', 0),
-		'enable_bbcode'			=> array('BOOL', 1),
-		'enable_smilies'		=> array('BOOL', 1),
-		'enable_magic_url'		=> array('BOOL', 1),
-		'enable_sig'			=> array('BOOL', 1),
-		'message_subject'		=> array('STEXT_UNI', ''),
-		'message_text'			=> array('MTEXT_UNI', ''),
-		'message_edit_reason'	=> array('STEXT_UNI', ''),
-		'message_edit_user'		=> array('UINT', 0),
-		'message_attachment'	=> array('BOOL', 0),
-		'bbcode_bitfield'		=> array('VCHAR:255', ''),
-		'bbcode_uid'			=> array('VCHAR:8', ''),
-		'message_edit_time'		=> array('TIMESTAMP', 0),
-		'message_edit_count'	=> array('USINT', 0),
-		'to_address'			=> array('TEXT_UNI', ''),
-		'bcc_address'			=> array('TEXT_UNI', ''),
-		'message_reported'		=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> 'msg_id',
-	'KEYS'			=> array(
-		'author_ip'				=> array('INDEX', 'author_ip'),
-		'message_time'			=> array('INDEX', 'message_time'),
-		'author_id'				=> array('INDEX', 'author_id'),
-		'root_level'			=> array('INDEX', 'root_level'),
-	),
-);
-
-$schema_data['phpbb_privmsgs_folder'] = array(
-	'COLUMNS'		=> array(
-		'folder_id'				=> array('UINT', NULL, 'auto_increment'),
-		'user_id'				=> array('UINT', 0),
-		'folder_name'			=> array('VCHAR_UNI', ''),
-		'pm_count'				=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'folder_id',
-	'KEYS'			=> array(
-		'user_id'				=> array('INDEX', 'user_id'),
-	),
-);
-
-$schema_data['phpbb_privmsgs_rules'] = array(
-	'COLUMNS'		=> array(
-		'rule_id'				=> array('UINT', NULL, 'auto_increment'),
-		'user_id'				=> array('UINT', 0),
-		'rule_check'			=> array('UINT', 0),
-		'rule_connection'		=> array('UINT', 0),
-		'rule_string'			=> array('VCHAR_UNI', ''),
-		'rule_user_id'			=> array('UINT', 0),
-		'rule_group_id'			=> array('UINT', 0),
-		'rule_action'			=> array('UINT', 0),
-		'rule_folder_id'		=> array('INT:11', 0),
-	),
-	'PRIMARY_KEY'	=> 'rule_id',
-	'KEYS'			=> array(
-		'user_id'				=> array('INDEX', 'user_id'),
-	),
-);
-
-$schema_data['phpbb_privmsgs_to'] = array(
-	'COLUMNS'		=> array(
-		'msg_id'				=> array('UINT', 0),
-		'user_id'				=> array('UINT', 0),
-		'author_id'				=> array('UINT', 0),
-		'pm_deleted'			=> array('BOOL', 0),
-		'pm_new'				=> array('BOOL', 1),
-		'pm_unread'				=> array('BOOL', 1),
-		'pm_replied'			=> array('BOOL', 0),
-		'pm_marked'				=> array('BOOL', 0),
-		'pm_forwarded'			=> array('BOOL', 0),
-		'folder_id'				=> array('INT:11', 0),
-	),
-	'KEYS'			=> array(
-		'msg_id'				=> array('INDEX', 'msg_id'),
-		'author_id'				=> array('INDEX', 'author_id'),
-		'usr_flder_id'			=> array('INDEX', array('user_id', 'folder_id')),
-	),
-);
-
-$schema_data['phpbb_profile_fields'] = array(
-	'COLUMNS'		=> array(
-		'field_id'				=> array('UINT', NULL, 'auto_increment'),
-		'field_name'			=> array('VCHAR_UNI', ''),
-		'field_type'			=> array('VCHAR:100', ''),
-		'field_ident'			=> array('VCHAR:20', ''),
-		'field_length'			=> array('VCHAR:20', ''),
-		'field_minlen'			=> array('VCHAR', ''),
-		'field_maxlen'			=> array('VCHAR', ''),
-		'field_novalue'			=> array('VCHAR_UNI', ''),
-		'field_default_value'	=> array('VCHAR_UNI', ''),
-		'field_validation'		=> array('VCHAR_UNI:20', ''),
-		'field_required'		=> array('BOOL', 0),
-		'field_show_novalue'	=> array('BOOL', 0),
-		'field_show_on_reg'		=> array('BOOL', 0),
-		'field_show_on_pm'		=> array('BOOL', 0),
-		'field_show_on_vt'		=> array('BOOL', 0),
-		'field_show_on_ml'		=> array('BOOL', 0),
-		'field_show_profile'	=> array('BOOL', 0),
-		'field_hide'			=> array('BOOL', 0),
-		'field_no_view'			=> array('BOOL', 0),
-		'field_active'			=> array('BOOL', 0),
-		'field_order'			=> array('UINT', 0),
-		'field_is_contact'		=> array('BOOL', 0),
-		'field_contact_desc'	=> array('VCHAR', ''),
-		'field_contact_url'		=> array('VCHAR', ''),
-	),
-	'PRIMARY_KEY'	=> 'field_id',
-	'KEYS'			=> array(
-		'fld_type'			=> array('INDEX', 'field_type'),
-		'fld_ordr'			=> array('INDEX', 'field_order'),
-	),
-);
-
-$schema_data['phpbb_profile_fields_data'] = array(
-	'COLUMNS'		=> array(
-		'user_id'				=> array('UINT', 0),
-		'pf_phpbb_location'		=> array('VCHAR', ''),
-		'pf_phpbb_interests'	=> array('TEXT_UNI', ''),
-		'pf_phpbb_occupation'	=> array('TEXT_UNI', ''),
-		'pf_phpbb_icq'			=> array('VCHAR', ''),
-		'pf_phpbb_aol'			=> array('VCHAR', ''),
-		'pf_phpbb_wlm'			=> array('VCHAR', ''),
-		'pf_phpbb_yahoo'		=> array('VCHAR', ''),
-		'pf_phpbb_website'		=> array('VCHAR', ''),
-	),
-	'PRIMARY_KEY'	=> 'user_id',
-);
-
-$schema_data['phpbb_profile_fields_lang'] = array(
-	'COLUMNS'		=> array(
-		'field_id'				=> array('UINT', 0),
-		'lang_id'				=> array('UINT', 0),
-		'option_id'				=> array('UINT', 0),
-		'field_type'			=> array('VCHAR:100', ''),
-		'lang_value'			=> array('VCHAR_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> array('field_id', 'lang_id', 'option_id'),
-);
-
-$schema_data['phpbb_profile_lang'] = array(
-	'COLUMNS'		=> array(
-		'field_id'				=> array('UINT', 0),
-		'lang_id'				=> array('UINT', 0),
-		'lang_name'				=> array('VCHAR_UNI', ''),
-		'lang_explain'			=> array('TEXT_UNI', ''),
-		'lang_default_value'	=> array('VCHAR_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> array('field_id', 'lang_id'),
-);
-
-$schema_data['phpbb_ranks'] = array(
-	'COLUMNS'		=> array(
-		'rank_id'				=> array('UINT', NULL, 'auto_increment'),
-		'rank_title'			=> array('VCHAR_UNI', ''),
-		'rank_min'				=> array('UINT', 0),
-		'rank_special'			=> array('BOOL', 0),
-		'rank_image'			=> array('VCHAR', ''),
-	),
-	'PRIMARY_KEY'	=> 'rank_id',
-);
-
-$schema_data['phpbb_reports'] = array(
-	'COLUMNS'		=> array(
-		'report_id'							=> array('UINT', NULL, 'auto_increment'),
-		'reason_id'							=> array('USINT', 0),
-		'post_id'							=> array('UINT', 0),
-		'pm_id'								=> array('UINT', 0),
-		'user_id'							=> array('UINT', 0),
-		'user_notify'						=> array('BOOL', 0),
-		'report_closed'						=> array('BOOL', 0),
-		'report_time'						=> array('TIMESTAMP', 0),
-		'report_text'						=> array('MTEXT_UNI', ''),
-		'reported_post_text'				=> array('MTEXT_UNI', ''),
-		'reported_post_uid'					=> array('VCHAR:8', ''),
-		'reported_post_bitfield'			=> array('VCHAR:255', ''),
-		'reported_post_enable_magic_url'	=> array('BOOL', 1),
-		'reported_post_enable_smilies'		=> array('BOOL', 1),
-		'reported_post_enable_bbcode'		=> array('BOOL', 1)
-	),
-	'PRIMARY_KEY'	=> 'report_id',
-	'KEYS'			=> array(
-		'post_id'			=> array('INDEX', 'post_id'),
-		'pm_id'				=> array('INDEX', 'pm_id'),
-	),
-);
-
-$schema_data['phpbb_reports_reasons'] = array(
-	'COLUMNS'		=> array(
-		'reason_id'				=> array('USINT', NULL, 'auto_increment'),
-		'reason_title'			=> array('VCHAR_UNI', ''),
-		'reason_description'	=> array('MTEXT_UNI', ''),
-		'reason_order'			=> array('USINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'reason_id',
-);
-
-$schema_data['phpbb_search_results'] = array(
-	'COLUMNS'		=> array(
-		'search_key'			=> array('VCHAR:32', ''),
-		'search_time'			=> array('TIMESTAMP', 0),
-		'search_keywords'		=> array('MTEXT_UNI', ''),
-		'search_authors'		=> array('MTEXT', ''),
-	),
-	'PRIMARY_KEY'	=> 'search_key',
-);
-
-$schema_data['phpbb_search_wordlist'] = array(
-	'COLUMNS'		=> array(
-		'word_id'			=> array('UINT', NULL, 'auto_increment'),
-		'word_text'			=> array('VCHAR_UNI', ''),
-		'word_common'		=> array('BOOL', 0),
-		'word_count'		=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'word_id',
-	'KEYS'			=> array(
-		'wrd_txt'			=> array('UNIQUE', 'word_text'),
-		'wrd_cnt'			=> array('INDEX', 'word_count'),
-	),
-);
-
-$schema_data['phpbb_search_wordmatch'] = array(
-	'COLUMNS'		=> array(
-		'post_id'			=> array('UINT', 0),
-		'word_id'			=> array('UINT', 0),
-		'title_match'		=> array('BOOL', 0),
-	),
-	'KEYS'			=> array(
-		'unq_mtch'			=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
-		'word_id'			=> array('INDEX', 'word_id'),
-		'post_id'			=> array('INDEX', 'post_id'),
-	),
-);
-
-$schema_data['phpbb_sessions'] = array(
-	'COLUMNS'		=> array(
-		'session_id'			=> array('CHAR:32', ''),
-		'session_user_id'		=> array('UINT', 0),
-		'session_forum_id'		=> array('UINT', 0),
-		'session_last_visit'	=> array('TIMESTAMP', 0),
-		'session_start'			=> array('TIMESTAMP', 0),
-		'session_time'			=> array('TIMESTAMP', 0),
-		'session_ip'			=> array('VCHAR:40', ''),
-		'session_browser'		=> array('VCHAR:150', ''),
-		'session_forwarded_for'	=> array('VCHAR:255', ''),
-		'session_page'			=> array('VCHAR_UNI', ''),
-		'session_viewonline'	=> array('BOOL', 1),
-		'session_autologin'		=> array('BOOL', 0),
-		'session_admin'			=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> 'session_id',
-	'KEYS'			=> array(
-		'session_time'		=> array('INDEX', 'session_time'),
-		'session_user_id'	=> array('INDEX', 'session_user_id'),
-		'session_fid'		=> array('INDEX', 'session_forum_id'),
-	),
-);
-
-$schema_data['phpbb_sessions_keys'] = array(
-	'COLUMNS'		=> array(
-		'key_id'			=> array('CHAR:32', ''),
-		'user_id'			=> array('UINT', 0),
-		'last_ip'			=> array('VCHAR:40', ''),
-		'last_login'		=> array('TIMESTAMP', 0),
-	),
-	'PRIMARY_KEY'	=> array('key_id', 'user_id'),
-	'KEYS'			=> array(
-		'last_login'		=> array('INDEX', 'last_login'),
-	),
-);
-
-$schema_data['phpbb_sitelist'] = array(
-	'COLUMNS'		=> array(
-		'site_id'		=> array('UINT', NULL, 'auto_increment'),
-		'site_ip'		=> array('VCHAR:40', ''),
-		'site_hostname'	=> array('VCHAR', ''),
-		'ip_exclude'	=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'		=> 'site_id',
-);
-
-$schema_data['phpbb_smilies'] = array(
-	'COLUMNS'		=> array(
-		'smiley_id'			=> array('UINT', NULL, 'auto_increment'),
-		// We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed.
-		'code'				=> array('VCHAR_UNI:50', ''),
-		'emotion'			=> array('VCHAR_UNI:50', ''),
-		'smiley_url'		=> array('VCHAR:50', ''),
-		'smiley_width'		=> array('USINT', 0),
-		'smiley_height'		=> array('USINT', 0),
-		'smiley_order'		=> array('UINT', 0),
-		'display_on_posting'=> array('BOOL', 1),
-	),
-	'PRIMARY_KEY'	=> 'smiley_id',
-	'KEYS'			=> array(
-		'display_on_post'		=> array('INDEX', 'display_on_posting'),
-	),
-);
-
-$schema_data['phpbb_styles'] = array(
-	'COLUMNS'		=> array(
-		'style_id'				=> array('UINT', NULL, 'auto_increment'),
-		'style_name'			=> array('VCHAR_UNI:255', ''),
-		'style_copyright'		=> array('VCHAR_UNI', ''),
-		'style_active'			=> array('BOOL', 1),
-		'style_path'			=> array('VCHAR:100', ''),
-		'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-		'style_parent_id'		=> array('UINT:4', 0),
-		'style_parent_tree'		=> array('TEXT', ''),
-	),
-	'PRIMARY_KEY'	=> 'style_id',
-	'KEYS'			=> array(
-		'style_name'		=> array('UNIQUE', 'style_name'),
-	),
-);
-
-$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'),
-		'forum_id'					=> array('UINT', 0),
-		'icon_id'					=> array('UINT', 0),
-		'topic_attachment'			=> array('BOOL', 0),
-		'topic_visibility'			=> array('TINT:3', 0),
-		'topic_reported'			=> array('BOOL', 0),
-		'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
-		'topic_poster'				=> array('UINT', 0),
-		'topic_time'				=> array('TIMESTAMP', 0),
-		'topic_time_limit'			=> array('TIMESTAMP', 0),
-		'topic_views'				=> array('UINT', 0),
-		'topic_posts_approved'		=> array('UINT', 0),
-		'topic_posts_unapproved'	=> array('UINT', 0),
-		'topic_posts_softdeleted'	=> array('UINT', 0),
-		'topic_status'				=> array('TINT:3', 0),
-		'topic_type'				=> array('TINT:3', 0),
-		'topic_first_post_id'		=> array('UINT', 0),
-		'topic_first_poster_name'	=> array('VCHAR_UNI', ''),
-		'topic_first_poster_colour'	=> array('VCHAR:6', ''),
-		'topic_last_post_id'		=> array('UINT', 0),
-		'topic_last_poster_id'		=> array('UINT', 0),
-		'topic_last_poster_name'	=> array('VCHAR_UNI', ''),
-		'topic_last_poster_colour'	=> array('VCHAR:6', ''),
-		'topic_last_post_subject'	=> array('STEXT_UNI', ''),
-		'topic_last_post_time'		=> array('TIMESTAMP', 0),
-		'topic_last_view_time'		=> array('TIMESTAMP', 0),
-		'topic_moved_id'			=> array('UINT', 0),
-		'topic_bumped'				=> array('BOOL', 0),
-		'topic_bumper'				=> array('UINT', 0),
-		'poll_title'				=> array('STEXT_UNI', ''),
-		'poll_start'				=> array('TIMESTAMP', 0),
-		'poll_length'				=> array('TIMESTAMP', 0),
-		'poll_max_options'			=> array('TINT:4', 1),
-		'poll_last_vote'			=> array('TIMESTAMP', 0),
-		'poll_vote_change'			=> array('BOOL', 0),
-		'topic_delete_time'			=> array('TIMESTAMP', 0),
-		'topic_delete_reason'		=> array('STEXT_UNI', ''),
-		'topic_delete_user'			=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'topic_id',
-	'KEYS'			=> array(
-		'forum_id'			=> array('INDEX', 'forum_id'),
-		'forum_id_type'		=> array('INDEX', array('forum_id', 'topic_type')),
-		'last_post_time'	=> array('INDEX', 'topic_last_post_time'),
-		'topic_visibility'	=> array('INDEX', 'topic_visibility'),
-		'forum_appr_last'	=> array('INDEX', array('forum_id', 'topic_visibility', 'topic_last_post_id')),
-		'fid_time_moved'	=> array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')),
-	),
-);
-
-$schema_data['phpbb_topics_track'] = array(
-	'COLUMNS'		=> array(
-		'user_id'			=> array('UINT', 0),
-		'topic_id'			=> array('UINT', 0),
-		'forum_id'			=> array('UINT', 0),
-		'mark_time'			=> array('TIMESTAMP', 0),
-	),
-	'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
-	'KEYS'			=> array(
-		'topic_id'			=> array('INDEX', 'topic_id'),
-		'forum_id'			=> array('INDEX', 'forum_id'),
-	),
-);
-
-$schema_data['phpbb_topics_posted'] = array(
-	'COLUMNS'		=> array(
-		'user_id'			=> array('UINT', 0),
-		'topic_id'			=> array('UINT', 0),
-		'topic_posted'		=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
-);
-
-$schema_data['phpbb_topics_watch'] = array(
-	'COLUMNS'		=> array(
-		'topic_id'			=> array('UINT', 0),
-		'user_id'			=> array('UINT', 0),
-		'notify_status'		=> array('BOOL', 0),
-	),
-	'KEYS'			=> array(
-		'topic_id'			=> array('INDEX', 'topic_id'),
-		'user_id'			=> array('INDEX', 'user_id'),
-		'notify_stat'		=> array('INDEX', 'notify_status'),
-	),
-);
-
-$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),
-		'user_id'			=> array('UINT', 0),
-		'group_leader'		=> array('BOOL', 0),
-		'user_pending'		=> array('BOOL', 1),
-	),
-	'KEYS'			=> array(
-		'group_id'			=> array('INDEX', 'group_id'),
-		'user_id'			=> array('INDEX', 'user_id'),
-		'group_leader'		=> array('INDEX', 'group_leader'),
-	),
-);
-
-$schema_data['phpbb_users'] = array(
-	'COLUMNS'		=> array(
-		'user_id'					=> array('UINT', NULL, 'auto_increment'),
-		'user_type'					=> array('TINT:2', 0),
-		'group_id'					=> array('UINT', 3),
-		'user_permissions'			=> array('MTEXT', ''),
-		'user_perm_from'			=> array('UINT', 0),
-		'user_ip'					=> array('VCHAR:40', ''),
-		'user_regdate'				=> array('TIMESTAMP', 0),
-		'username'					=> array('VCHAR_CI', ''),
-		'username_clean'			=> array('VCHAR_CI', ''),
-		'user_password'				=> array('VCHAR_UNI', ''),
-		'user_passchg'				=> array('TIMESTAMP', 0),
-		'user_pass_convert'			=> array('BOOL', 0),
-		'user_actkey'				=> array('VCHAR:32', ''),
-		'user_newpasswd'			=> array('VCHAR_UNI', ''),
-		'user_email'				=> array('VCHAR_UNI:100', ''),
-		'user_email_hash'			=> array('BINT', 0),
-		'user_birthday'				=> array('VCHAR:10', ''),
-		'user_lastvisit'			=> array('TIMESTAMP', 0),
-		'user_lastmark'				=> array('TIMESTAMP', 0),
-		'user_lastpost_time'		=> array('TIMESTAMP', 0),
-		'user_lastpage'				=> array('VCHAR_UNI:200', ''),
-		'user_last_confirm_key'		=> array('VCHAR:10', ''),
-		'user_last_search'			=> array('TIMESTAMP', 0),
-		'user_warnings'				=> array('TINT:4', 0),
-		'user_last_warning'			=> array('TIMESTAMP', 0),
-		'user_login_attempts'		=> array('TINT:4', 0),
-		'user_inactive_reason'		=> array('TINT:2', 0),
-		'user_inactive_time'		=> array('TIMESTAMP', 0),
-		'user_posts'				=> array('UINT', 0),
-		'user_lang'					=> array('VCHAR:30', ''),
-		'user_timezone'				=> array('VCHAR:100', 'UTC'),
-		'user_dateformat'			=> array('VCHAR_UNI:30', 'd M Y H:i'),
-		'user_style'				=> array('UINT', 0),
-		'user_rank'					=> array('UINT', 0),
-		'user_colour'				=> array('VCHAR:6', ''),
-		'user_new_privmsg'			=> array('INT:4', 0),
-		'user_unread_privmsg'		=> array('INT:4', 0),
-		'user_last_privmsg'			=> array('TIMESTAMP', 0),
-		'user_message_rules'		=> array('BOOL', 0),
-		'user_full_folder'			=> array('INT:11', -3),
-		'user_emailtime'			=> array('TIMESTAMP', 0),
-		'user_topic_show_days'		=> array('USINT', 0),
-		'user_topic_sortby_type'	=> array('VCHAR:1', 't'),
-		'user_topic_sortby_dir'		=> array('VCHAR:1', 'd'),
-		'user_post_show_days'		=> array('USINT', 0),
-		'user_post_sortby_type'		=> array('VCHAR:1', 't'),
-		'user_post_sortby_dir'		=> array('VCHAR:1', 'a'),
-		'user_notify'				=> array('BOOL', 0),
-		'user_notify_pm'			=> array('BOOL', 1),
-		'user_notify_type'			=> array('TINT:4', 0),
-		'user_allow_pm'				=> array('BOOL', 1),
-		'user_allow_viewonline'		=> array('BOOL', 1),
-		'user_allow_viewemail'		=> array('BOOL', 1),
-		'user_allow_massemail'		=> array('BOOL', 1),
-		'user_options'				=> array('UINT:11', 230271),
-		'user_avatar'				=> array('VCHAR', ''),
-		'user_avatar_type'			=> array('VCHAR:255', ''),
-		'user_avatar_width'			=> array('USINT', 0),
-		'user_avatar_height'		=> array('USINT', 0),
-		'user_sig'					=> array('MTEXT_UNI', ''),
-		'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
-		'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
-		'user_jabber'				=> array('VCHAR_UNI', ''),
-		'user_form_salt'			=> array('VCHAR_UNI:32', ''),
-		'user_new'					=> array('BOOL', 1),
-		'user_reminded'				=> array('TINT:4', 0),
-		'user_reminded_time'		=> array('TIMESTAMP', 0),
-	),
-	'PRIMARY_KEY'	=> 'user_id',
-	'KEYS'			=> array(
-		'user_birthday'				=> array('INDEX', 'user_birthday'),
-		'user_email_hash'			=> array('INDEX', 'user_email_hash'),
-		'user_type'					=> array('INDEX', 'user_type'),
-		'username_clean'			=> array('UNIQUE', 'username_clean'),
-	),
-);
-
-$schema_data['phpbb_warnings'] = array(
-	'COLUMNS'		=> array(
-		'warning_id'			=> array('UINT', NULL, 'auto_increment'),
-		'user_id'				=> array('UINT', 0),
-		'post_id'				=> array('UINT', 0),
-		'log_id'				=> array('UINT', 0),
-		'warning_time'			=> array('TIMESTAMP', 0),
-	),
-	'PRIMARY_KEY'	=> 'warning_id',
-);
-
-$schema_data['phpbb_words'] = array(
-	'COLUMNS'		=> array(
-		'word_id'				=> array('UINT', NULL, 'auto_increment'),
-		'word'					=> array('VCHAR_UNI', ''),
-		'replacement'			=> array('VCHAR_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> 'word_id',
-);
-
-$schema_data['phpbb_zebra'] = array(
-	'COLUMNS'		=> array(
-		'user_id'				=> array('UINT', 0),
-		'zebra_id'				=> array('UINT', 0),
-		'friend'				=> array('BOOL', 0),
-		'foe'					=> array('BOOL', 0),
-	),
-	'PRIMARY_KEY'	=> array('user_id', 'zebra_id'),
-);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ebd676b17a..35eea291dc 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2679,7 +2679,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
 	}
 	else
 	{
-		page_header(((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]), false);
+		page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]);
 	}
 
 	$template->set_filenames(array(
@@ -2956,7 +2956,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		'PASSWORD_CREDENTIAL'	=> ($admin) ? 'password_' . $credential : 'password',
 	));
 
-	page_header($user->lang['LOGIN'], false);
+	page_header($user->lang['LOGIN']);
 
 	$template->set_filenames(array(
 		'body' => 'login_body.html')
@@ -3032,7 +3032,7 @@ function login_forum_box($forum_data)
 		$template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']);
 	}
 
-	page_header($user->lang['LOGIN'], false);
+	page_header($user->lang['LOGIN']);
 
 	$template->assign_vars(array(
 		'FORUM_NAME'			=> isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '',
@@ -3945,7 +3945,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				}
 				else
 				{
-					page_header($msg_title, false);
+					page_header($msg_title);
 				}
 			}
 
@@ -4620,9 +4620,95 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
 }
 
 /**
+* Get user avatar
+*
+* @param array $user_row Row from the users table
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar html
+*/
+function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
+{
+	$row = \phpbb\avatar\manager::clean_row($user_row, 'user');
+	return phpbb_get_avatar($row, $alt, $ignore_config);
+}
+
+/**
+* Get group avatar
+*
+* @param array $group_row Row from the groups table
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar html
+*/
+function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
+{
+	$row = \phpbb\avatar\manager::clean_row($user_row, 'group');
+	return phpbb_get_avatar($row, $alt, $ignore_config);
+}
+
+/**
+* Get avatar
+*
+* @param array $row Row cleaned by \phpbb\avatar\driver\driver::clean_row
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar html
+*/
+function phpbb_get_avatar($row, $alt, $ignore_config = false)
+{
+	global $user, $config, $cache, $phpbb_root_path, $phpEx;
+	global $request;
+	global $phpbb_container;
+
+	if (!$config['allow_avatar'] && !$ignore_config)
+	{
+		return '';
+	}
+
+	$avatar_data = array(
+		'src' => $row['avatar'],
+		'width' => $row['avatar_width'],
+		'height' => $row['avatar_height'],
+	);
+
+	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
+	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
+	$html = '';
+
+	if ($driver)
+	{
+		$html = $driver->get_custom_html($user, $row, $alt);
+		if (!empty($html))
+		{
+			return $html;
+		}
+
+		$avatar_data = $driver->get_data($row, $ignore_config);
+	}
+	else
+	{
+		$avatar_data['src'] = '';
+	}
+
+	if (!empty($avatar_data['src']))
+	{
+		$html = '<img src="' . $avatar_data['src'] . '" ' .
+			($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
+			($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
+			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+	}
+
+	return $html;
+}
+
+/**
 * Generate page header
 */
-function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
+function page_header($page_title = '', $display_online_list = false, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
 	global $phpbb_dispatcher, $request, $phpbb_container, $phpbb_admin_path;
@@ -4686,7 +4772,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	if ($user->data['user_id'] != ANONYMOUS)
 	{
 		$u_login_logout = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout', true, $user->session_id);
-		$l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']);
+		$l_login_logout = $user->lang['LOGOUT'];
 	}
 	else
 	{
@@ -4830,6 +4916,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 
 	// The following assigns all _common_ variables that may be used at any point in a template.
 	$template->assign_vars(array(
+		'CURRENT_USER_AVATAR'	=> phpbb_get_user_avatar($user->data),
 		'SITENAME'						=> $config['sitename'],
 		'SITE_DESCRIPTION'				=> $config['site_desc'],
 		'PAGE_TITLE'					=> $page_title,
@@ -4859,6 +4946,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'SESSION_ID'		=> $user->session_id,
 		'ROOT_PATH'			=> $web_path,
 		'BOARD_URL'			=> $board_url,
+		'USERNAME_FULL'		=> get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
 
 		'L_LOGIN_LOGOUT'	=> $l_login_logout,
 		'L_INDEX'			=> ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'],
@@ -4875,6 +4963,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'U_SITE_HOME'			=> $config['site_home_url'],
 		'U_REGISTER'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
 		'U_PROFILE'				=> append_sid("{$phpbb_root_path}ucp.$phpEx"),
+		'U_USER_PROFILE'		=> get_username_string('profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
 		'U_MODCP'				=> append_sid("{$phpbb_root_path}mcp.$phpEx", false, true, $user->session_id),
 		'U_FAQ'					=> append_sid("{$phpbb_root_path}faq.$phpEx"),
 		'U_SEARCH_SELF'			=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=egosearch'),
@@ -4883,7 +4972,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'U_SEARCH_UNREAD'		=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'),
 		'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'),
 		'U_DELETE_COOKIES'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'),
-		'U_TEAM'				=> ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'),
+		'U_TEAM'				=> ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),
 		'U_TERMS_USE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
 		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
 		'U_RESTORE_PERMISSIONS'	=> ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index b31b268db7..81a381b326 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2920,8 +2920,24 @@ function get_database_size()
 		case 'mssql':
 		case 'mssql_odbc':
 		case 'mssqlnative':
+			$sql = 'SELECT @@VERSION AS mssql_version';
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+			
 			$sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize
 				FROM sysfiles';
+
+			if ($row)
+			{
+				// Azure stats are stored elsewhere
+				if (strpos($row['mssql_version'], 'SQL Azure') !== false)
+				{
+					$sql = 'SELECT ((SUM(reserved_page_count) * 8.0) * 1024.0) as dbsize 
+					FROM sys.dm_db_partition_stats';
+				}
+			}
+
 			$result = $db->sql_query($sql, 7200);
 			$database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false;
 			$db->sql_freeresult($result);
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 024c656267..164dd4cb99 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -39,13 +39,6 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 		'avatar_height'	=> $avatar_height,
 	);
 
-	if (!function_exists('phpbb_get_avatar'))
-	{
-		global $phpbb_root_path, $phpEx;
-
-		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-	}
-
 	return phpbb_get_avatar($row, $alt, $ignore_config);
 }
 
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 8122b87e4b..dd9201165b 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1415,6 +1415,38 @@ function phpbb_add_quickmod_option($option, $lang_string)
 }
 
 /**
+* Concatenate an array into a string list.
+*
+* @param array $items Array of items to concatenate
+* @param object $user The phpBB $user object.
+*
+* @return string String list. Examples: "A"; "A and B"; "A, B, and C"
+*/
+function phpbb_generate_string_list($items, $user)
+{
+	if (empty($items))
+	{
+		return '';
+	}
+
+	$count = sizeof($items);
+	$last_item = array_pop($items);
+	$lang_key = 'STRING_LIST_MULTI';
+
+	if ($count == 1)
+	{
+		return $last_item;
+	}
+	else if ($count == 2)
+	{
+		$lang_key = 'STRING_LIST_SIMPLE';
+	}
+	$list = implode($user->lang['COMMA_SEPARATOR'], $items);
+
+	return $user->lang($lang_key, $list, $last_item);
+}
+
+/**
 * @package phpBB3
 */
 class bitfield
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index cd2c9e5ae6..2b11d00f1e 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1377,92 +1377,6 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 }
 
 /**
-* Get user avatar
-*
-* @param array $user_row Row from the users table
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-*
-* @return string Avatar html
-*/
-function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
-{
-	$row = \phpbb\avatar\manager::clean_row($user_row, 'user');
-	return phpbb_get_avatar($row, $alt, $ignore_config);
-}
-
-/**
-* Get group avatar
-*
-* @param array $group_row Row from the groups table
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-*
-* @return string Avatar html
-*/
-function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
-{
-	$row = \phpbb\avatar\manager::clean_row($user_row, 'group');
-	return phpbb_get_avatar($row, $alt, $ignore_config);
-}
-
-/**
-* Get avatar
-*
-* @param array $row Row cleaned by \phpbb\avatar\driver\driver::clean_row
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-*
-* @return string Avatar html
-*/
-function phpbb_get_avatar($row, $alt, $ignore_config = false)
-{
-	global $user, $config, $cache, $phpbb_root_path, $phpEx;
-	global $request;
-	global $phpbb_container;
-
-	if (!$config['allow_avatar'] && !$ignore_config)
-	{
-		return '';
-	}
-
-	$avatar_data = array(
-		'src' => $row['avatar'],
-		'width' => $row['avatar_width'],
-		'height' => $row['avatar_height'],
-	);
-
-	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
-	$html = '';
-
-	if ($driver)
-	{
-		$html = $driver->get_custom_html($user, $row, $alt);
-		if (!empty($html))
-		{
-			return $html;
-		}
-
-		$avatar_data = $driver->get_data($row, $ignore_config);
-	}
-	else
-	{
-		$avatar_data['src'] = '';
-	}
-
-	if (!empty($avatar_data['src']))
-	{
-		$html = '<img src="' . $avatar_data['src'] . '" ' .
-			($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
-			($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
-			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
-	}
-
-	return $html;
-}
-
-/**
 * Generate a list of archive types available for compressing attachments
 *
 * @param string $param_key Either topic_id or post_id
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index e043883145..ef2e009a6e 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -956,7 +956,7 @@ class p_master
 	/**
 	* Display module
 	*/
-	function display($page_title, $display_online_list = true)
+	function display($page_title, $display_online_list = false)
 	{
 		global $template, $user;
 
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 28de8724be..be8e09b0c3 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -174,10 +174,6 @@ class mcp_notes
 		}
 
 		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('phpbb_get_user_avatar'))
-		{
-			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-		}
 
 		$rank_title = $rank_img = '';
 		$avatar_img = phpbb_get_user_avatar($userrow);
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index d396d004dc..768b7c991d 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -293,7 +293,7 @@ class mcp_warn
 		$message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], $parse_flags, true);
 
 		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('phpbb_get_user_avatar'))
+		if (!function_exists('get_user_rank'))
 		{
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
@@ -398,11 +398,10 @@ class mcp_warn
 		}
 
 		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('phpbb_get_user_avatar'))
+		if (!function_exists('get_user_rank'))
 		{
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
-
 		get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
 		$avatar_img = phpbb_get_user_avatar($user_row);
 
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index f0ce21fb48..b4b14b11d7 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -354,6 +354,8 @@ class ucp_main
 							'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
 							'U_LAST_POST_AUTHOR'		=> get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
 
+							'S_UNREAD_FORUM'		=> $unread_forum,
+
 							'U_LAST_POST'			=> $last_post_url,
 							'U_VIEWFORUM'			=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']))
 						);
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index b68389cba7..03064a31d3 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -338,13 +338,13 @@ function get_user_information($user_id, $user_row)
 		}
 	}
 
-	if (!function_exists('phpbb_get_user_avatar'))
+	$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
+
+	if (!function_exists('get_user_rank'))
 	{
 		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
-	$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
-
 	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
 
 	if ((!empty($user_row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email'))
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 3772d56e28..76f8988fb9 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -515,10 +515,6 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-				if (!function_exists('phpbb_get_user_avatar'))
-				{
-					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-				}
 
 				add_form_key('ucp_avatar');