makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10073] Move config values to config_text

Browse source 
PHPBB3-10073
This commit is contained in:
Joas Schilling 2014-05-20 21:32:17 +02:00
parent 1c0036f118
commit e2e7e2a55b
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/services.yml
View file

@ -243,6 +243,7 @@ services:
arguments: arguments:
- @auth - @auth
- @config - @config
- @config_text
- @dbal.conn - @dbal.conn
- @user - @user
- %core.root_path% - %core.root_path%

6
phpBB/install/schemas/schema_data.sql
View file

@ -83,9 +83,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_attachment_c
INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_form_enable', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_form_enable', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_info_uid', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_info_bitfield', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_info_flags', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/');
@ -305,6 +302,9 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnin
# Config text # Config text
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_bitfield', '');
INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_flags', '');
# -- 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);

15
phpBB/phpbb/message/admin_form.php
View file

@ -157,11 +157,18 @@ class admin_form extends form
$l_admin_info = $this->config_text->get('contact_admin_info'); $l_admin_info = $this->config_text->get('contact_admin_info');
if ($l_admin_info) if ($l_admin_info)
{ {
$contact_admin_data = $this->config_text->get_array(array(
'contact_admin_info',
'contact_admin_info_uid',
'contact_admin_info_bitfield',
'contact_admin_info_flags',
));
$l_admin_info = generate_text_for_display( $l_admin_info = generate_text_for_display(
$this->config_text->get('contact_admin_info'), $contact_admin_data['contact_admin_info'],
$this->config['contact_admin_info_uid'], $contact_admin_data['contact_admin_info_uid'],
$this->config['contact_admin_info_bitfield'], $contact_admin_data['contact_admin_info_bitfield'],
$this->config['contact_admin_info_flags'] $contact_admin_data['contact_admin_info_flags']
); );
} }