From cfd0fe6943d577bd076ded43ee5375378327552b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Feb 2023 20:31:19 +0100 Subject: [PATCH 1/3] [prep-release-3.3.1] Update version numbers to 3.3.10 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index ebe52d47e0..b48d8076a8 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 3ceca77e4f..d1c4d74f08 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.3.10-RC1'); +@define('PHPBB_VERSION', '3.3.10'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 5e0613ca1c..008b06716a 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.3.10-RC1'); +define('PHPBB_VERSION', '3.3.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 2bd0f94a60..63e63d0acc 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,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.3.10-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.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 4a185ed02e3653e6ebbfc00662a94d9e7226fda8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Feb 2023 20:31:26 +0100 Subject: [PATCH 2/3] [prep-release-3.3.1] Add migration for 3.3.10 --- phpBB/phpbb/db/migration/data/v33x/v3310.php | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3310.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3310.php b/phpBB/phpbb/db/migration/data/v33x/v3310.php new file mode 100644 index 0000000000..faffb61b3a --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3310.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\v33x; + +class v3310 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.10', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3310rc1', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.10']], + ]; + } +} From 81f67f3a6e30aa474c9749949e817cc426dae77c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Feb 2023 20:32:52 +0100 Subject: [PATCH 3/3] [prep-release-3.3.1] Update changelog for 3.3.10 --- phpBB/docs/CHANGELOG.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 69847603dc..48910db5c1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog