diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-12-12 15:17:26 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-12-12 15:17:26 +0100 |
| commit | c5a7643b72d93c349b83804034aacced4869c6e3 (patch) | |
| tree | c2d4180507f3a63f7a6b00765ef572aa960936ca /phpBB/install | |
| parent | 901785bc5ee46634fcbbb839b95932f13c80253a (diff) | |
| parent | 099a1b5f7535b0bef786b241e967bd71e4d91dbf (diff) | |
| download | forums-c5a7643b72d93c349b83804034aacced4869c6e3.tar forums-c5a7643b72d93c349b83804034aacced4869c6e3.tar.gz forums-c5a7643b72d93c349b83804034aacced4869c6e3.tar.bz2 forums-c5a7643b72d93c349b83804034aacced4869c6e3.tar.xz forums-c5a7643b72d93c349b83804034aacced4869c6e3.zip | |
Merge branch 'prep-release-3.1.7' 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 3a5e58cabd..56bc23c32d 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.6', + 'phpbb_version' => '3.1.7', '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 1b6766e1b1..efc815a852 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.7-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.7-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'); |