From ad43169065e8116832fd1f4e59cb79b3e15de2bf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 25 Jul 2020 11:25:39 +0200 Subject: [PATCH 1/4] [prep-release-3.2.10] Update version numbers to 3.2.10 --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build.xml b/build/build.xml index 93711ebe9c..06ac74eac4 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 7722ddc82a..0777f33922 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.10-RC2'); +@define('PHPBB_VERSION', '3.2.10'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 857070c795..de1f20411a 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.10-RC2'); +define('PHPBB_VERSION', '3.2.10'); $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 7564613af1..c47604dbc1 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -306,7 +306,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock 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.10-RC2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.10'); 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 0766a10ad3c8ad5bb0044e377425974f521a6b9a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 25 Jul 2020 11:27:02 +0200 Subject: [PATCH 2/4] [prep-release-3.2.10] Add migration for 3.2.10 --- phpBB/phpbb/db/migration/data/v32x/v3210.php | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v32x/v3210.php diff --git a/phpBB/phpbb/db/migration/data/v32x/v3210.php b/phpBB/phpbb/db/migration/data/v32x/v3210.php new file mode 100644 index 0000000000..2817158639 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v3210.php @@ -0,0 +1,36 @@ + +* @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\v32x; + +class v3210 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.10', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\v3210rc2', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.10')), + ); + } +} From 40027e054c72da38d09c3afa5108acc96836d91f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 27 Jul 2020 20:41:29 +0200 Subject: [PATCH 3/4] [prep-release-3.2.10] Fix incorrect version constrainst for packaging --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 06ac74eac4..f089a3037f 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + From fdc827e06657418695441625704907a4ce89d8cd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 27 Jul 2020 20:41:50 +0200 Subject: [PATCH 4/4] [prep-release-3.2.10] Update Changelog for 3.2.10 --- phpBB/docs/CHANGELOG.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9185ec6a55..62e954f2d8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog