From ae40c6365ec1a5a621bb431519258aa973f70967 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:41:28 +0100 Subject: [PATCH 1/5] [prep-release-3.3.15] Update version numbers to 3.3.15-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index 3c5dafcf86..48e58c2217 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 3734899352..5502664c82 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.15-dev'); +@define('PHPBB_VERSION', '3.3.15-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 58bb984370..bcb42920c1 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.14'); +define('PHPBB_VERSION', '3.3.15-RC1'); $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 ed73c1d532..c848e12e8e 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.15-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-RC1'); 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 24fc7d5388b2a0d772c3d6a2cefd1f0b31482d47 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:41:36 +0100 Subject: [PATCH 2/5] [prep-release-3.3.15] Update version numbers to 3.3.15 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 014dc0e370..7d4ed05bd9 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.14', + 'phpbb_version' => '3.3.15', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 1dfc8230b7..cf175b6d25 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.14 -phpbb_version = 3.3.14 +style_version = 3.3.15 +phpbb_version = 3.3.15 # Defining a different template bitfield # template_bitfield = //g= From d9e4ce6ddef81acd034b3a7eb2212ed478b2537c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:45:21 +0100 Subject: [PATCH 3/5] [prep-release-3.3.15] Add migration for 3.3.15-RC1 --- .../phpbb/db/migration/data/v33x/v3315rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3315rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php new file mode 100644 index 0000000000..71ab26c908 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3315rc1.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 v3315rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.15-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\topic_views_update', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.15-RC1']], + ]; + } +} From 66650cb0e2cfbb81b119a4019b086e69335339b2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:55:15 +0100 Subject: [PATCH 4/5] [prep-release-3.3.15] Update changelog for 3.3.15-RC1 --- phpBB/docs/CHANGELOG.html | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4674867ecd..06cd3c9316 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.14
    • Changes since 3.3.14-RC1
    • Changes since 3.3.13
    • Changes since 3.3.13-RC1
      • @@ -173,6 +174,32 @@
      +

      Changes since 3.3.14

      +

      Bug

      +
        +
      • [PHPBB-17227] - Member list sorting bug - repeating users on several pages
        • +
      • [PHPBB-17381] - 'topic_views' column overflow blocks access to the topic
        • +
      • [PHPBB-17417] - Day selection not visible when no results
        • +
      • [PHPBB-17422] - Ascending posts pagination
        • +
      • [PHPBB-17436] - PHP fatal error while converting from phpBB 2.0 with Attachment MOD
        • +
      • [PHPBB-17455] - PHP warning on MySQLi connection failure
        • +
      • [PHPBB-17463] - Extra & in unread posts search pagination
        • +
      • [PHPBB-17468] - Reset password feature is not restricted to email
        • +
      • [PHPBB-17470] - Enable feeds setting not enforced
        • +
      +

      Improvement

      +
        +
      • [PHPBB-17429] - Adding event before users have been added to a group
        • +
      • [PHPBB-17431] - Add more vars to memberlist event
        • +
      • [PHPBB-17433] - Unclear instructions in ACP, Server settings
        • +
      • [PHPBB-17443] - Various Guzzle client issues for version checks
        • +
      • [PHPBB-17446] - Add acp_account_activation_edit_add event
        • +
      • [PHPBB-17461] - Add php events for ACP main actions
        • +
      • [PHPBB-17467] - Add TLS v.1.3 support to email messenger connection
        • +
      • [PHPBB-17471] - Forum feed link in forumlist_body does not return the correct URL
        • +
      • [PHPBB-17478] - Add security policy to repository
        • +
      +

      Changes since 3.3.14-RC1

      Improvement

        From bb3d41e193547d20b42d372faed9a3d277449133 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 2 Mar 2025 17:11:26 +0100 Subject: [PATCH 5/5] [3.3.x] Update version numbers to 3.3.16-dev --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index 48e58c2217..83a492625f 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 5502664c82..89ace2e439 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.15-RC1'); +@define('PHPBB_VERSION', '3.3.16-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c848e12e8e..f6938204c7 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.15-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.16-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');