diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-22 19:22:40 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-22 19:22:40 +0100 |
| commit | a5b3393bb0efd66a8b7b1f9bccf2fddb35cb05b7 (patch) | |
| tree | 549938cec9ce4f3ea17b175861e5ec09e8a3d074 /phpBB | |
| parent | 5c3b6a855944d7a370186987ebebe3a896cf76a2 (diff) | |
| download | forums-a5b3393bb0efd66a8b7b1f9bccf2fddb35cb05b7.tar forums-a5b3393bb0efd66a8b7b1f9bccf2fddb35cb05b7.tar.gz forums-a5b3393bb0efd66a8b7b1f9bccf2fddb35cb05b7.tar.bz2 forums-a5b3393bb0efd66a8b7b1f9bccf2fddb35cb05b7.tar.xz forums-a5b3393bb0efd66a8b7b1f9bccf2fddb35cb05b7.zip | |
[prep-release-3.1.2] Update version to 3.1.2-RC1
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/style.cfg | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 2d4cb727a7..2b73316530 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.2-RC1-dev'); +define('PHPBB_VERSION', '3.1.2-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index effd72aeff..da53d2c143 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.1', + 'phpbb_version' => '3.1.2', '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 8fd163a81f..963f5c8604 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.2-RC1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.2-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'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 9684df73ba..41e0d68714 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.1.1 -phpbb_version = 3.1.1 +style_version = 3.1.2 +phpbb_version = 3.1.2 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 3b33c07002..6014b89e66 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Limited -style_version = 3.1.1 -phpbb_version = 3.1.1 +style_version = 3.1.2 +phpbb_version = 3.1.2 # Defining a different template bitfield # template_bitfield = lNg= |