From 2f17757f4e4f368fa99f9fa09114c642604d4850 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Sep 2016 13:43:48 +0200 Subject: [PATCH 1/4] [prep-release-3.1.10] Update version to 3.1.10-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- phpBB/styles/subsilver2/style.cfg | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build.xml b/build/build.xml index 2bece48edc..0c5e8e1e87 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 7260c5719b..53c26026d1 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.1.10-dev'); +define('PHPBB_VERSION', '3.1.10-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 838ce1a682..2afec68de6 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.1.9', + 'phpbb_version' => '3.1.10', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9262f70b5d..4214fb4e1b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,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.1.10-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.10-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'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index ed1790f802..300a83164b 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.1.9 -phpbb_version = 3.1.9 +style_version = 3.1.10 +phpbb_version = 3.1.10 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index d728e27baf..4c9abcc02d 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Limited -style_version = 3.1.9 -phpbb_version = 3.1.9 +style_version = 3.1.10 +phpbb_version = 3.1.10 # Defining a different template bitfield # template_bitfield = lNg= From c958ba13e829fae40c5d252b7da7c8b17cb6ae11 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Sep 2016 13:45:50 +0200 Subject: [PATCH 2/4] [prep-release-3.1.10] Add migration for 3.1.10-RC1 --- .../phpbb/db/migration/data/v31x/v3110rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v3110rc1.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v3110rc1.php b/phpBB/phpbb/db/migration/data/v31x/v3110rc1.php new file mode 100644 index 0000000000..da69f2384e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v3110rc1.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\v31x; + +class v3110rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.1.10-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v319', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.10-RC1')), + ); + } +} From 7d73d1ff83ea34c77b7d53a4c3a8a6444c368bfb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Sep 2016 13:50:19 +0200 Subject: [PATCH 3/4] [prep-release-3.1.10] Add changelog for 3.1.10-RC1 --- phpBB/docs/CHANGELOG.html | 84 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6b97e80724..394d9536e8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.1.9
    • Changes since 3.1.8
    • Changes since 3.1.7-PL1
    • Changes since 3.1.7
      • @@ -118,7 +119,88 @@
      -

      Changes since 3.1.8

      +

      Changes since 3.1.9

      + +

      Bug

      +
        +
      • [PHPBB3-11446] - Use sql_in_set as designed and consistent with the rest of phpBB code in phpbb_notification_manager
        • +
      • [PHPBB3-12230] - Do not auto remove user group when Newly Registered Users group was disabled
        • +
      • [PHPBB3-12925] - Use plural for permanent delete posts/topics confirmation
        • +
      • [PHPBB3-14109] - MySQL InnoDB does not support multiple index definitions on the same query.
        • +
      • [PHPBB3-14291] - Function send_file_to_browser() endlessly overwrites 'filesize' in ATTACHMENTS_TABLE
        • +
      • [PHPBB3-14610] - Q&A CAPTCHA logs error when it has been solved
        • +
      • [PHPBB3-14615] - delete avatar triggers the new min max value in the HTML5 inputs
        • +
      • [PHPBB3-14616] - Auto-prune fails on large forums
        • +
      • [PHPBB3-14631] - 3.1.9 DB cli update crashes with PHP Fatal error: Call to undefined function phpbb\truncate_string()
        • +
      • [PHPBB3-14654] - Imagemagick > ImageMagick
        • +
      • [PHPBB3-14661] - Fix a typo in twig.php
        • +
      • [PHPBB3-14673] - Missing Language Variable
        • +
      • [PHPBB3-14683] - Typos in operators in some email templates
        • +
      • [PHPBB3-14703] - module.add adds a module to the wrong parent
        • +
      • [PHPBB3-14704] - Remove unused language files and corresponding functions
        • +
      • [PHPBB3-14721] - New registrants choosing old deleted usernames get linked to old accounts with namechange
        • +
      • [PHPBB3-14742] - Improvements to migrator
        • +
      • [PHPBB3-14745] - "U_NOTIFICATION_SETTINGS" contains an HTML entity but is printed in a plaintext email
        • +
      • [PHPBB3-14755] - Error in MCP Move posts
        • +
      • [PHPBB3-14782] - Quick Links > Your Posts gives mysql error
        • +
      • [PHPBB3-14788] - Update developer list to reflect team changes
        • +
      • [PHPBB3-14796] - Log table is using constant in log delete method
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13709] - Fallback to english in email templates by extensions
        • +
      • [PHPBB3-13716] - Check phpBB version constant against config version
        • +
      • [PHPBB3-13865] - Complement core event search_modify_param
        • +
      • [PHPBB3-14184] - Missing info on SMTP mail function option
        • +
      • [PHPBB3-14429] - core.obtain_users_online_string_modify
        • +
      • [PHPBB3-14466] - Add an event to cron.php
        • +
      • [PHPBB3-14469] - [Template] - <!-- EVENT viewforum_topicrow_before -->
        • +
      • [PHPBB3-14516] - [Template] - memberlist_email_before
        • +
      • [PHPBB3-14581] - Add core events relating to soft delete
        • +
      • [PHPBB3-14592] - [PHP] - core.search_backend_search_after
        • +
      • [PHPBB3-14596] - Prevent installs of 3.1 on PHP 7
        • +
      • [PHPBB3-14624] - Add event to ucp_profile in signature section
        • +
      • [PHPBB3-14630] - Add event to ucp_pm_compose
        • +
      • [PHPBB3-14638] - [PHP] - multiple UCP subscription events for form data and template variables
        • +
      • [PHPBB3-14643] - Select newest file in restore list
        • +
      • [PHPBB3-14652] - Typo birthdays
        • +
      • [PHPBB3-14664] - Fix PHPDoc comment in cron manager
        • +
      • [PHPBB3-14672] - Add template event to viewforum
        • +
      • [PHPBB3-14685] - PHP event for altering announcements sql
        • +
      • [PHPBB3-14687] - Modify viewforum_modify_topicrow
        • +
      • [PHPBB3-14688] - Add core events to the feeds
        • +
      • [PHPBB3-14689] - Build 3.2.x API docs
        • +
      • [PHPBB3-14695] - Add posting_editor_subject_prepend/append template events
        • +
      • [PHPBB3-14712] - Add search.php core event to allow modifying the forum select list
        • +
      • [PHPBB3-14713] - Add core event to the admin function get_forum_list()
        • +
      • [PHPBB3-14715] - Add template events in posting_topic_review & mcp_topic
        • +
      • [PHPBB3-14720] - Add global javascript variable 'phpbb' to jshint settings
        • +
      • [PHPBB3-14727] - Event core.search_modify_submit_parameters
        • +
      • [PHPBB3-14738] - Add core events to improve modifying forum lists
        • +
      • [PHPBB3-14747] - Add topic_last_poster_id and topic_last_post_time to Event core.modify_posting_auth
        • +
      • [PHPBB3-14762] - Add core event to session.php to alter IP address
        • +
      • [PHPBB3-14781] - Add core event to the function group_user_attributes()
        • +
      • [PHPBB3-14783] - Event - ACP Posting Buttons Before Custom BBCodes
        • +
      • [PHPBB3-14784] - missing rewrite for lighttpd
        • +
      • [PHPBB3-14785] - [Template event] - overall_header_headerbar_append
        • +
      • [PHPBB3-14787] - Add more parameters to the core.search_modify_url_parameters event
        • +
      • [PHPBB3-14789] - Add missing link hash and form token checks to ACP
        • +
      +

      New Feature

      + +

      Task

      +
        +
      • [PHPBB3-12133] - Update list of browsers supporting filename* in Content-Disposition
        • +
      • [PHPBB3-14538] - Update composer dependencies
        • +
      • [PHPBB3-14598] - Phing Sniffer Testing Use Statements in DocBlocks
        • +
      • [PHPBB3-14743] - Remove PHP7 from test matrix in 3.1.x
        • +
      + +

      Changes since 3.1.8

      Bug

        From 51d830a6d332b4e37d90ee4f8455a6b3a47f9591 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 24 Sep 2016 21:39:47 +0200 Subject: [PATCH 4/4] [3.1.x] Increase version for 3.1.11 development --- 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 0c5e8e1e87..b732521e3e 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 53c26026d1..cafb819ffc 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.1.10-RC1'); +define('PHPBB_VERSION', '3.1.11-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4214fb4e1b..e13b23e4c4 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,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.1.10-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.11-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');