aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-02-05 17:12:39 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-02-05 17:12:39 +0100
commitdab282e664012a7292f310d52c99c952fc85a7ca (patch)
treec13fff154797c8080ac0db432d2d1e1327338a87
parent123422d1efe7453a117b1f5b2abbe83c6ae73d7f (diff)
downloadforums-dab282e664012a7292f310d52c99c952fc85a7ca.tar
forums-dab282e664012a7292f310d52c99c952fc85a7ca.tar.gz
forums-dab282e664012a7292f310d52c99c952fc85a7ca.tar.bz2
forums-dab282e664012a7292f310d52c99c952fc85a7ca.tar.xz
forums-dab282e664012a7292f310d52c99c952fc85a7ca.zip
[release-3.2.0-b1] Update version to 3.2.0-b2-dev
-rw-r--r--build/build.xml6
-rw-r--r--phpBB/includes/constants.php2
-rwxr-xr-xphpBB/install/phpbbcli.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
4 files changed, 6 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml
index d9e590c8c5..e6862c0886 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.2.0-b1" />
- <property name="prevversion" value="3.2.0-a2" />
- <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.2.0-a1" />
+ <property name="newversion" value="3.2.0-b2-dev" />
+ <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.2.0-a1, 3.2.0-a2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 288b5de48d..f2b56cc84b 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-b1');
+@define('PHPBB_VERSION', '3.2.0-b2-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index aa7256577f..70a8a9c7ea 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-b1');
+define('PHPBB_VERSION', '3.2.0-b2-dev');
$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 7fb632927f..6d3a199a5a 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -275,7 +275,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-b1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-b2-dev');
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');