From f9c165d2c16b85cff88439b55a4c52694d39df03 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Apr 2019 22:58:53 +0200 Subject: [PATCH 1/5] [prep-release-3.2.6] Update version numbers for 3.2.6-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 dc9f3bbe0d..0dc59455c8 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 d80f348ac5..98b60166a3 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.2.6-dev'); +@define('PHPBB_VERSION', '3.2.6-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index f6893f0944..c87a9a83ad 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.2.5'); +define('PHPBB_VERSION', '3.2.6-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 2a032bb991..55dd72db0d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -279,7 +279,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 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.2.6-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.6-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 c3f7d1bd192d394a9b89fa99c869c277400337e3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Apr 2019 22:59:46 +0200 Subject: [PATCH 2/5] [prep-release-3.2.6] Update version numbers for 3.2.6 release process --- 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 2b4da2bb7f..a77e767a8c 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.2.5', + 'phpbb_version' => '3.2.6', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index a588f1e558..062074204d 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.2.5 -phpbb_version = 3.2.5 +style_version = 3.2.6 +phpbb_version = 3.2.6 # Defining a different template bitfield # template_bitfield = //g= From 3b2119e535b53e80f343c080dbef5f82bf83f5f6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Apr 2019 23:06:07 +0200 Subject: [PATCH 3/5] [prep-release-3.2.6] Add migration for 3.2.6-RC1 --- .../phpbb/db/migration/data/v32x/v326rc1.php | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v32x/v326rc1.php diff --git a/phpBB/phpbb/db/migration/data/v32x/v326rc1.php b/phpBB/phpbb/db/migration/data/v32x/v326rc1.php new file mode 100644 index 0000000000..092700d3db --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v326rc1.php @@ -0,0 +1,37 @@ + +* @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\v32x; + +class v326rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.6-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\v325', + ); + + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.6-RC1')), + ); + } +} From 2b0645b7b9030ce5101f3a3aa4c10ed446527dc8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Apr 2019 23:07:54 +0200 Subject: [PATCH 4/5] [prep-release-3.2.6] Update changelog for 3.2.6-RC1 --- phpBB/docs/CHANGELOG.html | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 09a3b8dff5..37710b30a6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.5
    • Changes since 3.2.5-RC1
    • Changes since 3.2.4
    • Changes since 3.2.4-RC1
      • @@ -135,6 +136,70 @@
      +

      Changes since 3.2.5

      +

      Bug

      +
        +
      • [PHPBB3-15509] - Update database: info message is to scary
        • +
      • [PHPBB3-15869] - Cookies Problem with domains with special chars
        • +
      • [PHPBB3-15876] - Mysql 5.7 support Q&A plugin
        • +
      • [PHPBB3-15883] - No error for invalid usernames on bulk add to usergroup
        • +
      • [PHPBB3-15904] - PHP warning when accessing modules in ACP System tab
        • +
      • [PHPBB3-15917] - Unapproved posts count towards forum post count
        • +
      • [PHPBB3-15918] - Ban reason messages show backslash (\) before apostrophe -- ex. (don\'t).
        • +
      • [PHPBB3-15919] - Lint test throws PHP warnings due to node modules folder
        • +
      • [PHPBB3-15931] - Issues in PM report emails
        • +
      • [PHPBB3-15954] - Some calls to include() don't have a safeguard
        • +
      • [PHPBB3-15957] - User preferences show notification method "both" with disabled Jabber in ACP
        • +
      • [PHPBB3-15959] - Travis Network Test is Failing for news.cnet.com
        • +
      • [PHPBB3-15965] - Console command to handle thumbnails have files directory hardcoded
        • +
      • [PHPBB3-15975] - Delete or prune an user doesn't remove its entries in the user_notifications table
        • +
      • [PHPBB3-15986] - Add missing language key for posting.php
        • +
      • [PHPBB3-15996] - Invalid data provider function name in migrator_tool_permission_test
        • +
      • [PHPBB3-16006] - Duplicate form IDs in UCP oauth form
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-15884] - Add memberlist_body_* events
        • +
      • [PHPBB3-15889] - Add core.memberlist_modify_memberrow_sql
        • +
      • [PHPBB3-15890] - Add core.memberlist_modify_viewprofile_sql
        • +
      • [PHPBB3-15891] - Add core.memberlist_modify_view_profile_template_vars
        • +
      • [PHPBB3-15898] - Add core.ucp_pm_compose_template
        • +
      • [PHPBB3-15899] - Add core.modify_attachment_sql_ary_on_* events
        • +
      • [PHPBB3-15901] - Add mcp_post_* template events
        • +
      • [PHPBB3-15910] - Pass object arguments by reference implicitly
        • +
      • [PHPBB3-15914] - Add core.modify_memberlist_viewprofile_group_sql and core.modify_memberlist_viewprofile_group_data
        • +
      • [PHPBB3-15915] - Add template events to posting_attach_body.html
        • +
      • [PHPBB3-15924] - Move from precise to trusty builds
        • +
      • [PHPBB3-15926] - Deny installs on PHP >= 7.3@dev - Increase min. req. to 5.4.7
        • +
      • [PHPBB3-15928] - Remove support for backup download
        • +
      • [PHPBB3-15939] - Pagination docblocks
        • +
      • [PHPBB3-15941] - Replace MAX SQL in functions_posting.php
        • +
      • [PHPBB3-15942] - Array to string conversion when permanently deleting a post
        • +
      • [PHPBB3-15948] - Add core.mcp_change_topic_type_after/before
        • +
      • [PHPBB3-15949] - [Template] - ucp_profile_signature_posting_editor_options_prepend
        • +
      • [PHPBB3-15950] - Add SQL transactions to mcp_main.php
        • +
      • [PHPBB3-15960] - Add SQL transactions to functions_admin.php
        • +
      • [PHPBB3-15970] - Add core.message_admin_form_submit_before
        • +
      • [PHPBB3-15972] - Add core.markread_after
        • +
      • [PHPBB3-15992] - Fix breadcrumb schema
        • +
      • [PHPBB3-15995] - Add core.memberlist_modify_sort_pagination_params
        • +
      • [PHPBB3-15997] - Increase webdriver timeout for UI tests
        • +
      • [PHPBB3-16001] - Append data to the OAuth's redirect URL
        • +
      • [PHPBB3-16009] - Display OAuth login's buttons in a row.
        • +
      • [PHPBB3-16010] - Automatically check order of events in events.md file
        • +
      • [PHPBB3-16018] - Update composer and dependencies for 3.2.6
        • +
      • [PHPBB3-16020] - Fix placement of event viewforum_body_topic_author_username_append
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-15944] - Add core.posting_modify_quote_attributes
        • +
      +

      Task

      + +

      Changes since 3.2.5-RC1

      Bug

        From bd2ddc1d2ec3e94a13e397198a8406d81481e9f2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 21 Apr 2019 00:17:25 +0200 Subject: [PATCH 5/5] [3.2.x] Update versions to 3.2.7-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 0dc59455c8..386fd6b53a 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 98b60166a3..7f36c620f3 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.2.6-RC1'); +@define('PHPBB_VERSION', '3.2.7-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 55dd72db0d..13ce10d6e9 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -279,7 +279,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 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.2.6-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.7-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');