diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-25 19:39:50 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-25 19:39:50 +0200 |
| commit | 103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e (patch) | |
| tree | 6a2f785684c3549c2faa20fb2f71d256d21f3c03 /phpBB/install | |
| parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
| parent | 6217a519202b7394cbad9982282ab7208f1f5ed4 (diff) | |
| download | forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar.gz forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar.bz2 forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar.xz forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13208] Add security issues to the final changelog
[prep-release-3.1.0] Prepare Changelog
[prep-release-3.1.0] Update version to 3.1.0
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 983c11cc98..8f6af30426 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.0-RC6', + 'phpbb_version' => '3.1.0', '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 f40b1a4d44..bc4a9f7fe1 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.0-RC7-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0'); 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'); |