From dd182c5433129c7116fb01afc1a80425e3c92d22 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 31 Jan 2015 01:03:55 +0100 Subject: [PATCH 1/3] [prep-release-3.1.3] Update version to 3.1.3-RC2 --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index a8d34d3db1..824b86e9fe 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 9d86e63765..44acf76721 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.3-RC1'); +define('PHPBB_VERSION', '3.1.3-RC2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4e1ff8aaf9..99bb3dd6af 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.3-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.3-RC2'); 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'); From 9232367b3545731060bb6db238fbe94129c735be Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 31 Jan 2015 01:06:23 +0100 Subject: [PATCH 2/3] [prep-release-3.1.3] Add migration for 3.1.3-RC2 --- .../phpbb/db/migration/data/v31x/v313rc2.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v313rc2.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v313rc2.php b/phpBB/phpbb/db/migration/data/v31x/v313rc2.php new file mode 100644 index 0000000000..d832d6f502 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v313rc2.php @@ -0,0 +1,32 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v313rc2 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v30x\release_3_0_13_pl1', + '\phpbb\db\migration\data\v31x\v313rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.3-RC2')), + ); + } +} From be30d8251a5c0a9ffb59f415cba7e10bbe714f68 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 31 Jan 2015 01:08:29 +0100 Subject: [PATCH 3/3] [prep-release-3.1.3] Add changelog for 3.1.3-RC2 --- phpBB/docs/CHANGELOG.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a7b47ab0f0..acf5a318be 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog