diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-02 22:05:58 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-02 22:05:58 +0100 |
| commit | 20dd65ff1a0a64354813f014c2c51782c7c5baf0 (patch) | |
| tree | 2a2558a74e5f14959639afd0d503bedd0e96f2e6 | |
| parent | 942383d74320612ca8d4eb413c1d23459942028a (diff) | |
| download | forums-20dd65ff1a0a64354813f014c2c51782c7c5baf0.tar forums-20dd65ff1a0a64354813f014c2c51782c7c5baf0.tar.gz forums-20dd65ff1a0a64354813f014c2c51782c7c5baf0.tar.bz2 forums-20dd65ff1a0a64354813f014c2c51782c7c5baf0.tar.xz forums-20dd65ff1a0a64354813f014c2c51782c7c5baf0.zip | |
[prep-release-3.2.0-b2] Update version to 3.2.0-b2
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/phpbbcli.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml index d9a182fbc1..f01ea65d48 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.2.0-b2-dev" /> + <property name="newversion" value="3.2.0-b2" /> <property name="prevversion" value="3.2.0-b1" /> <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.2.0-a1, 3.2.0-a2" /> <!-- no configuration should be needed beyond this point --> diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f2b56cc84b..8d09f73182 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.2.0-b2-dev'); +@define('PHPBB_VERSION', '3.2.0-b2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 414d23623a..6312ad076d 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.2.0-b1', + 'phpbb_version' => '3.2.0-b2', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 6b0ac39f84..34fb79b07c 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-b2-dev'); +define('PHPBB_VERSION', '3.2.0-b2'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ede31e53e6..12e0daa87e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -276,7 +276,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.2.0-b2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-b2'); 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 ec7d8d2e27..dd77b75520 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.2.0-b1 -phpbb_version = 3.2.0-b1 +style_version = 3.2.0-b2 +phpbb_version = 3.2.0-b2 # Defining a different template bitfield # template_bitfield = lNg= |