diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-24 21:35:42 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-24 21:35:42 +0200 |
| commit | 32d9efff47aafa844d1ab4b886dcf5772996a682 (patch) | |
| tree | 12421edd248aa83027475e3fa47b758310222e03 /phpBB/install | |
| parent | b8bbf9db03678c6c048856e067a4644e4e44b4b7 (diff) | |
| parent | 7d73d1ff83ea34c77b7d53a4c3a8a6444c368bfb (diff) | |
| download | forums-32d9efff47aafa844d1ab4b886dcf5772996a682.tar forums-32d9efff47aafa844d1ab4b886dcf5772996a682.tar.gz forums-32d9efff47aafa844d1ab4b886dcf5772996a682.tar.bz2 forums-32d9efff47aafa844d1ab4b886dcf5772996a682.tar.xz forums-32d9efff47aafa844d1ab4b886dcf5772996a682.zip | |
Merge branch 'prep-release-3.1.10' into 3.1.x
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 838ce1a682..2afec68de6 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.9', + 'phpbb_version' => '3.1.10', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9262f70b5d..4214fb4e1b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.10-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.10-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); |