3 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_contact.php b/phpBB/includes/acp/acp_contact.php
index cd62a42a93..13d38d9f29 100644
--- a/phpBB/includes/acp/acp_contact.php
+++ b/phpBB/includes/acp/acp_contact.php
@@ -23,7 +23,7 @@ class acp_contact
 
 	public function main($id, $mode)
 	{
-		global $db, $user, $request, $template;
+		global $user, $request, $template;
 		global $config, $phpbb_root_path, $phpEx, $phpbb_container;
 
 		$user->add_lang(array('acp/board', 'posting'));
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 7f2cf13bbf..b7f2271aed 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -304,7 +304,7 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnin
 INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info', '');
 INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_uid', '');
 INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_bitfield', '');
-INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_flags', '');
+INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_flags', '7');
 
 # -- Forum related auth options
 INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1);
diff --git a/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php b/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php
index 283840126e..e255efb99d 100644
--- a/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php
+++ b/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php
@@ -20,9 +20,6 @@ class contact_admin_form extends \phpbb\db\migration\migration
 	{
 		return array(
 			array('config.add', array('contact_admin_form_enable', 1)),
-			array('config.add', array('contact_admin_info_uid', '')),
-			array('config.add', array('contact_admin_info_bitfield', '')),
-			array('config.add', array('contact_admin_info_flags', '')),
 			array('custom', array(array($this, 'contact_admin_info'))),
 		);
 	}
@@ -30,6 +27,11 @@ class contact_admin_form extends \phpbb\db\migration\migration
 	public function contact_admin_info()
 	{
 		$text_config = new \phpbb\config\db_text($this->db, $this->table_prefix . 'config_text');
-		$text_config->set('contact_admin_info', '');
+		$text_config->set_array(array(
+			'contact_admin_info'			=> '',
+			'contact_admin_info_uid'		=> '',
+			'contact_admin_info_bitfield'	=> '',
+			'contact_admin_info_flags'		=> OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS,
+		));
 	}
 }