From 2b92ff372bb9a4f209a52de5a63eba5774aa603b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jun 2022 14:40:29 +0200 Subject: [PATCH 1/5] [prep-release-3.3.8] Update version numbers to 3.3.8-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 fb6077668e..b026628e32 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 ec44fdd24f..7874e75cf2 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.8-dev'); +@define('PHPBB_VERSION', '3.3.8-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 89ced71b7e..95fa3589de 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.7'); +define('PHPBB_VERSION', '3.3.8-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 b9e37fb354..b2c38b9559 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.8-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.8-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 d4415d4ad8795d1eb0de4b7a49751dffef28b542 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jun 2022 14:40:30 +0200 Subject: [PATCH 2/5] [prep-release-3.3.8] Update version numbers to 3.3.8 --- 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 11b1c5308b..f361705618 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.7', + 'phpbb_version' => '3.3.8', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 3c19d12744..84f1e9aa7f 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.7 -phpbb_version = 3.3.7 +style_version = 3.3.8 +phpbb_version = 3.3.8 # Defining a different template bitfield # template_bitfield = //g= From c6ef62858928cc2ac4fdab5b75ef0a1f6eae2b01 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jun 2022 14:40:31 +0200 Subject: [PATCH 3/5] [prep-release-3.3.8] Add migration for 3.3.8-RC1 --- .../phpbb/db/migration/data/v33x/v338rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v338rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v338rc1.php b/phpBB/phpbb/db/migration/data/v33x/v338rc1.php new file mode 100644 index 0000000000..28451cfea3 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v338rc1.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 v338rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.8-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\profilefield_youtube_update', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.8-RC1']], + ]; + } +} From bc4a787470767d76ece7baba9892f0256436068c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jun 2022 14:40:59 +0200 Subject: [PATCH 4/5] [prep-release-3.3.8] Update changelog for 3.3.8-RC1 --- phpBB/docs/CHANGELOG.html | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 08fa1cd0f5..1100679afa 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.7
    • Changes since 3.3.6
    • Changes since 3.3.6-RC1
    • Changes since 3.3.5
      • @@ -161,6 +162,33 @@
      +

      Changes since 3.3.7

      +

      Bug

      +
        +
      • [PHPBB3-13821] - Always show "Display this post" for foes
        • +
      • [PHPBB3-16871] - S_FORUM_ID and S_TOPIC_ID variables set by page_header may cause fatal errors in feeds
        • +
      • [PHPBB3-16891] - Controller Helper Routing in ACP can break Extension Installation
        • +
      • [PHPBB3-16960] - Migrations table not populated at the end of installation
        • +
      • [PHPBB3-16962] - Possible bug related with format date
        • +
      • [PHPBB3-16966] - "Insecure redirect" error while permanently deleting posts
        • +
      • [PHPBB3-16976] - phpBB Native Search returns 1 match and one page of results
        • +
      • [PHPBB3-16977] - Cron-job "img" tag at bottom breaks some styles and is inaccessible
        • +
      • [PHPBB3-16978] - </ul> Tag Missing From posting_pm_header.html Template
        • +
      • [PHPBB3-16981] - HTML-encoded emojis `&#128396;️ &#128208;` in email subject line
        • +
      • [PHPBB3-16990] - Wrong style template code in the post editor prevents deleting a post with certain permission combination
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13859] - Youtube profilefield needs an upgrade
        • +
      • [PHPBB3-15947] - "X out of 0 messages stored" in UCP
        • +
      • [PHPBB3-16800] - Language string NO_POSTS should be changed
        • +
      • [PHPBB3-16959] - Remove redundant URL parameters from notification mails
        • +
      • [PHPBB3-16967] - Deprecate use of PHP and INCLUDEPHP in templates
        • +
      • [PHPBB3-16969] - Flash status displays when posting when posts settings don't allow [FLASH] - BBCode
        • +
      • [PHPBB3-16988] - Ignore appended branch info when preparing commit message
        • +
      • [PHPBB3-16991] - Add events for bookmarks and subscribed topics in UCP
        • +
      +

      Changes since 3.3.6

      Bug

        From f930f8821fb33172b2486d3322e4484b28b03786 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jun 2022 22:54:43 +0200 Subject: [PATCH 5/5] [3.3.x] Update versions to 3.3.9-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 b026628e32..f9759a537b 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 7874e75cf2..3020cb52fd 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.8-RC1'); +@define('PHPBB_VERSION', '3.3.9-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b2c38b9559..6dc2075a23 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.8-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.9-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');