diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 20:57:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 20:57:00 +0200 |
| commit | 69eb563e1821d8c27f5beae2adc0abeed61ffec2 (patch) | |
| tree | f32f1a43bbc3c60b36c9cc94b71f6d29a12a7b75 /phpBB/install | |
| parent | 832c9f64e04ad22dce1d51e72f3c65df4894c0eb (diff) | |
| parent | 2c65b9b133ffc3ee958ce9d5a579f7d58741292d (diff) | |
| download | forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.gz forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.bz2 forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.xz forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.zip | |
Merge branch 'prep-release-3.1.5' 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 990b3136fd..7edbd08e03 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.4', + 'phpbb_version' => '3.1.5', '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 b740977468..972ee579db 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.5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.5-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'); |