[ticket/10073] Do not check disable boxes by default

PHPBB3-10073
This commit is contained in:
Joas Schilling 2014-06-09 01:35:34 +02:00
parent 6a9fd06b73
commit e3c3a5d2a7
3 changed files with 8 additions and 6 deletions

View file

@ -23,7 +23,7 @@ class acp_contact
public function main($id, $mode) public function main($id, $mode)
{ {
global $db, $user, $request, $template; global $user, $request, $template;
global $config, $phpbb_root_path, $phpEx, $phpbb_container; global $config, $phpbb_root_path, $phpEx, $phpbb_container;
$user->add_lang(array('acp/board', 'posting')); $user->add_lang(array('acp/board', 'posting'));

View file

@ -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', '');
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_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_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 # -- Forum related auth options
INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1);

View file

@ -20,9 +20,6 @@ class contact_admin_form extends \phpbb\db\migration\migration
{ {
return array( return array(
array('config.add', array('contact_admin_form_enable', 1)), 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'))), 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() public function contact_admin_info()
{ {
$text_config = new \phpbb\config\db_text($this->db, $this->table_prefix . 'config_text'); $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,
));
} }
} }