diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-10 09:53:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-10 09:53:58 +0200 |
| commit | fcc7e7d33306347128158ff843db08bd25039cb4 (patch) | |
| tree | e1aabf1762cee2673645e1252c4fd48d6dcce6ae /phpBB/install | |
| parent | 17620bba46138ec48a6748a4147986b1d21a48fd (diff) | |
| parent | 073f3e4470016af718f90070276305615abc007f (diff) | |
| download | forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar.gz forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar.bz2 forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar.xz forums-fcc7e7d33306347128158ff843db08bd25039cb4.zip | |
Merge branch 'prep-release-3.1.4' 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 511f850679..990b3136fd 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.3', + 'phpbb_version' => '3.1.4', '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 a39bb365d6..b6f11f7353 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.4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.4-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'); |