diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:49:07 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:49:07 +0200 |
| commit | 854854b60f2b452df57482667cd211bddd123663 (patch) | |
| tree | 5d8c4d3c5cc60441152abe78705763e7f0cfb31d /phpBB/install | |
| parent | e511ea71c17b34fb6bb5233831c6b0b88b1f98b8 (diff) | |
| parent | 45e39d0990c01f005a7dccc5a36de3dd0f62c585 (diff) | |
| download | forums-854854b60f2b452df57482667cd211bddd123663.tar forums-854854b60f2b452df57482667cd211bddd123663.tar.gz forums-854854b60f2b452df57482667cd211bddd123663.tar.bz2 forums-854854b60f2b452df57482667cd211bddd123663.tar.xz forums-854854b60f2b452df57482667cd211bddd123663.zip | |
Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
[ticket/8558] Fix operator
[ticket/8558] Fix field length in ACP
[ticket/8558] Use only one variable and improve explain string
[ticket/8558] Add config in migrations and schema_data
[ticket/8558] Add display name in emails from board
Conflicts:
phpBB/includes/functions_messenger.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index bc76bf55b9..fbf1374346 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -56,6 +56,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_width', INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path', 'images/avatars/upload'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_salt', 'phpbb_avatar'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', 'contact@yourdomain.tld'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact_name', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable_msg', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', 'address@yourdomain.tld'); |