diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-29 21:43:35 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-30 22:08:10 +0200 |
| commit | 254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7 (patch) | |
| tree | 5aa70954e161b01f7b14deba4f2ca10cad353cc9 | |
| parent | acb4d90371cfa2682e74e38c8e3bef087ace7600 (diff) | |
| download | forums-254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7.tar forums-254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7.tar.gz forums-254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7.tar.bz2 forums-254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7.tar.xz forums-254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7.zip | |
[prep-release-3.1.0-b2] Update version to 3.1.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 | ||||
| -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 |
6 files changed, 8 insertions, 8 deletions
diff --git a/build/build.xml b/build/build.xml index 10ff242ab9..9a765d6be5 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.1.0-b2-dev" /> + <property name="newversion" value="3.1.0-b2" /> <property name="prevversion" value="3.1.0-b1" /> <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3" /> <!-- no configuration should be needed beyond this point --> diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index fe23ed5a9a..69bc01c0f1 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -24,7 +24,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-b2-dev'); +define('PHPBB_VERSION', '3.1.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 e8c8a7431d..926f139da4 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -33,7 +33,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.0-b1', + 'phpbb_version' => '3.1.0-b2', 'author' => '<a href="https://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 885093f1ed..c781f59945 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -269,7 +269,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.0-b2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.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 6b73b25a79..1beb32685c 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -18,8 +18,8 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -style_version = 3.1.0-b1 -phpbb_version = 3.1.0-b1 +style_version = 3.1.0-b2 +phpbb_version = 3.1.0-b2 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 438ced13f4..c534c30bb9 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -18,8 +18,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -style_version = 3.1.0-b1 -phpbb_version = 3.1.0-b1 +style_version = 3.1.0-b2 +phpbb_version = 3.1.0-b2 # Defining a different template bitfield # template_bitfield = lNg= |