From f13b17fd0067ac9bbe751a010ddd69e6012a45d5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:35 +0200 Subject: [PATCH 1/5] [prep-release-3.3.12] Update version numbers to 3.3.12-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 90c22f943f..c3a741b891 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 4de56d8fdb..f5d8122628 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.12-dev'); +@define('PHPBB_VERSION', '3.3.12-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index b7e85890e3..31072dbd6b 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.12-dev'); +define('PHPBB_VERSION', '3.3.12-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 97ff395ac9..7ec43e3b54 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.12-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.12-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 74845a6b3a9215519888b712fe335a09ae6ae9e1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:36 +0200 Subject: [PATCH 2/5] [prep-release-3.3.12] Update version numbers to 3.3.12 --- 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 54d7c7f8d6..2d6a868938 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.11', + 'phpbb_version' => '3.3.12', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 8d7af0133e..3f6f8a35d6 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.11 -phpbb_version = 3.3.11 +style_version = 3.3.12 +phpbb_version = 3.3.12 # Defining a different template bitfield # template_bitfield = //g= From d2295b82f17ee8ed2da5a1584ebb3997a7a46d47 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:37 +0200 Subject: [PATCH 3/5] [prep-release-3.3.12] Add migration for 3.3.12-RC1 --- .../phpbb/db/migration/data/v33x/v3312rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3312rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php new file mode 100644 index 0000000000..77247b96f2 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3312rc1.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 v3312rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.12-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\jquery_update_v3', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.12-RC1']], + ]; + } +} From 6753961756da4998d98d651e6a09db763c088b38 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:38 +0200 Subject: [PATCH 4/5] [prep-release-3.3.12] Update stylesheet hashes for 3.3.12-RC1 --- phpBB/styles/prosilver/theme/stylesheet.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 5665c839ba..e866175bf7 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -12,10 +12,10 @@ @import url("utilities.css?hash=d8f72c42"); @import url("common.css?hash=a9741ba1"); @import url("links.css?hash=18286e16"); -@import url("content.css?hash=be57a41d"); +@import url("content.css?hash=d0e24377"); @import url("buttons.css?hash=56f0d25f"); @import url("cp.css?hash=50d868ab"); -@import url("forms.css?hash=b64464fb"); +@import url("forms.css?hash=9016b55c"); @import url("icons.css?hash=64da33ce"); @import url("colours.css?hash=fcb2f289"); -@import url("responsive.css?hash=87b53e08"); +@import url("responsive.css?hash=91525545"); From 7b734ef52996043b0ff940635ece56fe215de4fc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 13:01:53 +0200 Subject: [PATCH 5/5] [prep-release-3.3.12] Update changelog for 3.3.12-RC1 --- phpBB/docs/CHANGELOG.html | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b0e774b29e..37fe4a2cb5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.11
    • Changes since 3.3.10
    • Changes since 3.3.10-RC1
    • Changes since 3.3.9
      • @@ -167,6 +168,51 @@
      +

      Changes since 3.3.11

      +

      Bug

      +
        +
      • [PHPBB3-14047] - Jabber discards messages when stream gets closed without waiting for acknowledgement
        • +
      • [PHPBB3-15325] - Global moderator permissions shown in forum moderator permissions
        • +
      • [PHPBB3-16470] - Memberlist bug - sorting by Last active date is incorrect
        • +
      • [PHPBB3-17077] - Multiple posts at once, even if the user shouldn't ignore the flood interval
        • +
      • [PHPBB3-17117] - Deactivated notification method leads to crash
        • +
      • [PHPBB3-17130] - Text reparser changes magic URL state in posts
        • +
      • [PHPBB3-17187] - Unread Topic URL Link Not Working On MCP View Forum Topic List
        • +
      • [PHPBB3-17200] - Color Parse Error In viewonline.php Legend
        • +
      • [PHPBB3-17201] - Redirect to installer might be invalid when accessing subfolder
        • +
      • [PHPBB3-17202] - The bidi.css File Is Loaded When Viewing LTR Topic Print View Page
        • +
      • [PHPBB3-17203] - Group Description With BBCode Ordered List Breaks Layout
        • +
      • [PHPBB3-17207] - Extensions are unable to use PHPBB_USE_BOARD_URL_PATH
        • +
      • [PHPBB3-17208] - Update Error YouTube Profilfeld
        • +
      • [PHPBB3-17212] - Who is online incorrectly reports page when posting with only post URL parameter
        • +
      • [PHPBB3-17237] - QUICKMOD_ACTION_NOT_ALLOWED uses " instead of '
        • +
      • [PHPBB3-17286] - Non-existent urls to be written down to session_page
        • +
      • [PHPBB3-17292] - Link to spamhaus.org no longer valid
        • +
      • [PHPBB3-17296] - mod_security false positive denies access to ACP
        • +
      • [PHPBB3-17302] - Password reset function does not update all necessary data
        • +
      • [PHPBB3-17306] - Wrong declaration of function input values
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-17230] - Update doctum for PHP 8.1 support
        • +
      • [PHPBB3-17232] - Improve MySQL error messages in PHP 8.1+
        • +
      • [PHPBB3-17233] - Add PHP 8.3 tests to the 3.3.x branch
        • +
      • [PHPBB3-17235] - Missing autocomplete for username & password
        • +
      • [PHPBB3-17236] - Update symfony dependencies to improve PHP 8.3 compatibility
        • +
      • [PHPBB3-17277] - Add template events to UCP
        • +
      • [PHPBB3-17284] - Add event to add content after the online users list in viewtopic
        • +
      • [PHPBB3-17293] - Update composer and dependencies to latest versions
        • +
      • [PHPBB3-17299] - Allow core event to modify variables while sending email
        • +
      • [PHPBB3-17303] - Update jQuery to 3.7+
        • +
      • [PHPBB3-17305] - Improve queries for unanswered topics and posts
        • +
      • [PHPBB3-17310] - Update GitHub actions workflows to Node.js 20
        • +
      +

      Task

      +
        +
      • [PHPBB3-17204] - Update composer and node dependencies
        • +
      • [PHPBB3-17280] - Fallback to branch name on branches without ticket ID
        • +
      +

      Changes since 3.3.10

      Bug