From eaa0c779a6e3d56bfc34723a0fd8f9eb8c9b4ef0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 19:36:42 +0200 Subject: [PATCH 1/5] [prep-release-3.3.14] Update version numbers to 3.3.14-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 c85bc1db0a..773b31897d 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 9e2924d96c..a0cc587663 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.14-dev'); +@define('PHPBB_VERSION', '3.3.14-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index f22a878add..56bee134ba 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.13'); +define('PHPBB_VERSION', '3.3.14-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 9da79e77be..7192d630c7 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.14-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14-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 4c419c5acd0abbdd959baf49b1126528edeb01f8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 19:36:43 +0200 Subject: [PATCH 2/5] [prep-release-3.3.14] Update version numbers to 3.3.14 --- 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 7a02946f77..014dc0e370 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.13', + 'phpbb_version' => '3.3.14', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 0b16bfde55..1dfc8230b7 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.13 -phpbb_version = 3.3.13 +style_version = 3.3.14 +phpbb_version = 3.3.14 # Defining a different template bitfield # template_bitfield = //g= From 7c090c6e2a9b9503c726e99ed71f5e1e0dcb0dc0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 19:39:11 +0200 Subject: [PATCH 3/5] [prep-release-3.3.14] Add migration for 3.3.14-RC1 --- .../phpbb/db/migration/data/v33x/v3314rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3314rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php new file mode 100644 index 0000000000..1632a65dda --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3314rc1.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 v3314rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.14-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3313', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.14-RC1']], + ]; + } +} From c9922720368dad8710799d6b746b39e633a5c06c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 20:15:47 +0200 Subject: [PATCH 4/5] [prep-release-3.3.14] Update changelog for 3.3.14-RC1 --- phpBB/docs/CHANGELOG.html | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 39d7897d5e..638bdbdf1c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.13
    • Changes since 3.3.13-RC1
    • Changes since 3.3.12
    • Changes since 3.3.12-RC1
      • @@ -171,6 +172,36 @@
      +

      Changes since 3.3.13

      +

      Bug

      +
        +
      • [PHPBB-17181] - If statement to highlight Reported PMS on the view message page doesn't work.
        • +
      • [PHPBB-17383] - HELO/EHLO error while using gethostbyaddr()
        • +
      • [PHPBB-17384] - Passing E_USER_ERROR to trigger_error() is deprecated in PHP 8.4
        • +
      • [PHPBB-17385] - Version check without SSL flag for CDB extensions fails
        • +
      • [PHPBB-17386] - Incorrect trace result while tracing user-based permissions
        • +
      • [PHPBB-17387] - PHP warnings in search results
        • +
      • [PHPBB-17390] - Missing buttons for approval of new messages
        • +
      • [PHPBB-17391] - PHP warnings on attempt to create user group having name already in use
        • +
      • [PHPBB-17398] - Ajax error on deleting cookies
        • +
      • [PHPBB-17405] - Function phpbb_gmgetdate() returns incorrect result for edge cases
        • +
      • [PHPBB-17410] - UCP tabs do not work when testing out another user's permissions
        • +
      +

      Improvement

      +
        +
      • [PHPBB-16852] - Addition of a new PHP event concerning bump topics
        • +
      • [PHPBB-17359] - Distinct disabled and not installed extensions in the list
        • +
      • [PHPBB-17376] - Link reference to quote post is a poor accessibility experience
        • +
      • [PHPBB-17382] - Incorrect grammar on FAQ page regarding searching for members
        • +
      • [PHPBB-17388] - Add php event to bump_topic_allowed function
        • +
      • [PHPBB-17394] - Check mergeability of PR on GitHub Actions
        • +
      • [PHPBB-17396] - Automatically handle merges of 3.3.x into master
        • +
      • [PHPBB-17397] - Add event for forum_data query in viewforum
        • +
      • [PHPBB-17402] - Add possibility to force reparsing BBCode via CLI
        • +
      • [PHPBB-17407] - Limit mergeability check to single comment
        • +
      • [PHPBB-17411] - Add core event to search.php
        • +
      +

      Changes since 3.3.13-RC1

      Bug

        From 725cbd31c8d114c196edc661689adecb1ba64991 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 22 Oct 2024 20:43:13 +0200 Subject: [PATCH 5/5] [3.3.x] Update versions to 3.3.15-dev --- 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 773b31897d..6a72273ff4 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 a0cc587663..3734899352 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.14-RC1'); +@define('PHPBB_VERSION', '3.3.15-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7192d630c7..ed73c1d532 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.14-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-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');