diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-09-15 17:48:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-09-15 17:48:51 +0200 |
| commit | 5dc7aba18ffa1e47d835c80bdb6f921293fc0c18 (patch) | |
| tree | 6c2814183f45f4cefe9e347e53b5d23ab5288552 /phpBB/install | |
| parent | f1fb555ea32fdd06dfdcae35c072e44b6c243126 (diff) | |
| parent | 480e3daede1cba1e0c62878be3bd12810e4ccf37 (diff) | |
| download | forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.gz forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.bz2 forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.xz forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
[ticket/11021] Remove unnecessary line spacing in functions.php
[ticket/11021] Use L_SITE_HOME instead of L_HOME
[ticket/11021] Better language strings for site home url/text
[ticket/11021] subsilver2 support
[ticket/11021] Add the option to specify a Site home URL and text
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5fa6166913..1d65fd14ff 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2685,6 +2685,12 @@ function change_database_data(&$no_updates, $version) // After we have calculated the timezones we can delete user_dst column from user table. $db_tools->sql_column_remove(USERS_TABLE, 'user_dst'); } + + if (!isset($config['site_home_url'])) + { + $config->set('site_home_url', ''); + $config->set('site_home_text', ''); + } break; } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ae7b9fcba3..dbb5fd7481 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -242,6 +242,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_protocol', INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length', '3600'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', '{L_CONFIG_SITE_DESC}'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_url', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_text', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', '{L_CONFIG_SITENAME}'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_per_page', '50'); |