From 04ef19595ceffadaa97292916f859977d51e586e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2017 17:42:55 +0200 Subject: [PATCH 1/4] [prep-release-3.1.11] Update version numbers to 3.1.11-RC1 --- build/build.xml | 6 +++--- 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, 10 insertions(+), 10 deletions(-) diff --git a/build/build.xml b/build/build.xml index cc29aec654..3a73e09410 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 23839e3d9a..79f5a6f30f 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'); +define('PHPBB_VERSION', '3.1.11-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 2afec68de6..4aca80188a 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.10', + 'phpbb_version' => '3.1.11', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 3449829d8c..22a539e186 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'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.11-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 300a83164b..019db11bc7 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.10 -phpbb_version = 3.1.10 +style_version = 3.1.11 +phpbb_version = 3.1.11 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 4c9abcc02d..65d846402d 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.10 -phpbb_version = 3.1.10 +style_version = 3.1.11 +phpbb_version = 3.1.11 # Defining a different template bitfield # template_bitfield = lNg= From 65f7137825577532c5568448abf9118c29db0a8a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2017 17:45:07 +0200 Subject: [PATCH 2/4] [prep-release-3.1.11] Add migration for update to 3.1.11-RC1 --- .../phpbb/db/migration/data/v31x/v3111rc1.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v3111rc1.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v3111rc1.php b/phpBB/phpbb/db/migration/data/v31x/v3111rc1.php new file mode 100644 index 0000000000..259656283f --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v3111rc1.php @@ -0,0 +1,43 @@ + +* @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 v3111rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.1.11-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v3110', + '\phpbb\db\migration\data\v31x\add_log_time_index', + '\phpbb\db\migration\data\v31x\increase_size_of_emotion', + '\phpbb\db\migration\data\v31x\add_jabber_ssl_context_config_options', + '\phpbb\db\migration\data\v31x\add_smtp_ssl_context_config_options', + '\phpbb\db\migration\data\v31x\update_hashes', + '\phpbb\db\migration\data\v31x\remove_duplicate_migrations', + '\phpbb\db\migration\data\v31x\add_latest_topics_index', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.11-RC1')), + ); + } +} From d81174330313db7ccba368a120c772fd8a3e2205 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2017 17:48:07 +0200 Subject: [PATCH 3/4] [prep-release-3.1.11] Update changelog for 3.1.11-RC1 --- phpBB/docs/CHANGELOG.html | 144 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 394d9536e8..52284b32ee 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.1.10
    • Changes since 3.1.9
    • Changes since 3.1.8
    • Changes since 3.1.7-PL1
      • @@ -119,6 +120,149 @@
      +

      Changes since 3.1.10

      + +

      Bug

      +
        +
      • [PHPBB3-7336] - Words in new topic title aren't found by search after topic is split
        • +
      • [PHPBB3-8116] - Server timeout or browsercrash after viewing postdetails
        • +
      • [PHPBB3-8301] - admin log generate slow queries
        • +
      • [PHPBB3-9590] - Unable to update permissions for more than 6 forums at a time
        • +
      • [PHPBB3-11076] - Update notification in ACP for minimum PHP version missing essential information
        • +
      • [PHPBB3-11483] - Forced Activation needs looking at.
        • +
      • [PHPBB3-11611] - setup_github_network.php no longer creates a repository
        • +
      • [PHPBB3-13247] - Online indicator in post profile hides behind certain avatars
        • +
      • [PHPBB3-13250] - File cache does not write entries starting with _ and containing a slash
        • +
      • [PHPBB3-13429] - Changes tag in docblock of events should be unified
        • +
      • [PHPBB3-13558] - Error - stream_socket_enable_crypto()
        • +
      • [PHPBB3-13757] - Negative PM count
        • +
      • [PHPBB3-14468] - [php] - 'core.viewforum_modify_topics_data' add parameter forum_id
        • +
      • [PHPBB3-14549] - Correctly redirect back after topic merge in MCP
        • +
      • [PHPBB3-14770] - Plupload: WRONG_FILESIZE is used wrong
        • +
      • [PHPBB3-14795] - Topic merge bug
        • +
      • [PHPBB3-14801] - Search highlight option doesn't always highlight unicode strings
        • +
      • [PHPBB3-14802] - Empty/blank lines should not be additional poll options
        • +
      • [PHPBB3-14806] - Authentication for e-mail is not working
        • +
      • [PHPBB3-14819] - Soft deleted posts visible in topic review
        • +
      • [PHPBB3-14821] - Do not expect parsed HTML in kernel subscriber output
        • +
      • [PHPBB3-14830] - FORM_INVALID error on ACP search and CPF settings
        • +
      • [PHPBB3-14831] - Extension migration file fails
        • +
      • [PHPBB3-14838] - feeds.attachments_base - server 500 error for large attachment tables
        • +
      • [PHPBB3-14844] - BBcodes B and I return <strong> and <em> tags instead of CSS under inherited styles
        • +
      • [PHPBB3-14859] - PM report notifications only sent out to full Global Moderators
        • +
      • [PHPBB3-14860] - Broken link on subscriptions page on mobile devices
        • +
      • [PHPBB3-14863] - "Array" in message title when permanently deleting posts
        • +
      • [PHPBB3-14864] - ACP datefromat text input still has 30 max length while dateformat field had been expanded to 64
        • +
      • [PHPBB3-14876] - Multibyte message is not displayed properly on exception
        • +
      • [PHPBB3-14877] - CSS error in ".codebox code" definition
        • +
      • [PHPBB3-14881] - Problems using EVENT (overall_footer_content_after)
        • +
      • [PHPBB3-14888] - Missing check for disabled profile field types
        • +
      • [PHPBB3-14889] - Missing method declaration in profile fields type interface
        • +
      • [PHPBB3-14890] - Wrong validation of input field in profile field type string
        • +
      • [PHPBB3-14906] - Duplicated sig key in user_cache_data array
        • +
      • [PHPBB3-14923] - SQL PostgreSQL blocking errors during DB update installation
        • +
      • [PHPBB3-14938] - Inconsistent data results from ext_mgr->all_available() vs ext_mgr->is_available()
        • +
      • [PHPBB3-14941] - MySQL Fulltext search index creating still fails on InnoDB
        • +
      • [PHPBB3-14943] - Template loop access gives PHP error
        • +
      • [PHPBB3-14953] - Incorrect "order by" definition in ucp_pm_viewfolder
        • +
      • [PHPBB3-14968] - Version check marks 3.1.10 boards as outdated
        • +
      • [PHPBB3-14997] - Bad Position for topiclist_row_topic_title_after
        • +
      • [PHPBB3-14998] - ACP Update link is incorrect!
        • +
      • [PHPBB3-15003] - When using mark all, disabled check boxes should not become checked
        • +
      • [PHPBB3-15006] - Permission inheritance with checkbox not working
        • +
      • [PHPBB3-15011] - Error not checked on metadata load failure
        • +
      • [PHPBB3-15108] - Duplicate code in request->overwrite
        • +
      • [PHPBB3-15143] - version check on branch is broken
        • +
      • [PHPBB3-15146] - Date profile field validation incorrect
        • +
      • [PHPBB3-15150] - Yabber SSL/TLS certification
        • +
      • [PHPBB3-15187] - ACP Template files not purged during Extension Enable
        • +
      • [PHPBB3-15246] - Memcache driver incorrectly handles Unix sockets
        • +
      • [PHPBB3-15248] - Event core.modify_posting_auth does not honor its parameters
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-9211] - List subforums-links separately in parent-forums' legend
        • +
      • [PHPBB3-12749] - core.submit_post_end add subject to the event data
        • +
      • [PHPBB3-13457] - New Hooks for ucp_main
        • +
      • [PHPBB3-13459] - New Template-Event in overall_header.html
        • +
      • [PHPBB3-13479] - Add hook for modifying highlighting on viewtopic
        • +
      • [PHPBB3-13601] - New event upon acl_clear_prefetch
        • +
      • [PHPBB3-13603] - New event upon index_body_online_block_after
        • +
      • [PHPBB3-13605] - New event upon ucp_pm_compose_predefined_message
        • +
      • [PHPBB3-13608] - New event upon ucp_restore_permissions
        • +
      • [PHPBB3-13609] - New event upon ucp_switch_permissions
        • +
      • [PHPBB3-13845] - Add event when user changes or delete avatar
        • +
      • [PHPBB3-14119] - [PHP] - (User) unban event request
        • +
      • [PHPBB3-14239] - [PHP] - Add event ucp_remind_modify_select_sql
        • +
      • [PHPBB3-14331] - Add rank calculation or result event access
        • +
      • [PHPBB3-14520] - [Template] - ucp_pm_viewmessage_message_body_after
        • +
      • [PHPBB3-14522] - [Template] - ucp_register_buttons_before
        • +
      • [PHPBB3-14524] - [PHP] - core.ucp_register_requests_after
        • +
      • [PHPBB3-14733] - Support increasing hashing cost factor
        • +
      • [PHPBB3-14750] - Fileupload form should not set invalid attributes for file input
        • +
      • [PHPBB3-14758] - ACP-Parameter "Maximum thumbnail width in pixel" should be "Maximum thumbnail width/heigth in pixel:"
        • +
      • [PHPBB3-14759] - Event core.mcp_main_modify_shadow_sql
        • +
      • [PHPBB3-14760] - Event core.mcp_main_modify_fork_sql
        • +
      • [PHPBB3-14786] - Add mcp_forum_actions_before/after events
        • +
      • [PHPBB3-14804] - Add core event to MCP after merging topics
        • +
      • [PHPBB3-14805] - Allow building package for previous versions on PHP 7
        • +
      • [PHPBB3-14808] - Add template event overall_header_searchbox_after
        • +
      • [PHPBB3-14817] - Add core event on includes/functions_download.php
        • +
      • [PHPBB3-14825] - Add OAuth events
        • +
      • [PHPBB3-14827] - Possibility to add multiple form keys
        • +
      • [PHPBB3-14842] - Avatar size 0 - unlimited
        • +
      • [PHPBB3-14847] - Add php event to add options in ACP Attachments
        • +
      • [PHPBB3-14848] - Add ACP template events after extensions list titles
        • +
      • [PHPBB3-14849] - Add ACP extension event
        • +
      • [PHPBB3-14850] - Add core events for smilies
        • +
      • [PHPBB3-14852] - Add core event to the function build_header()
        • +
      • [PHPBB3-14853] - Add core event to allow modifying PM attachments download auth
        • +
      • [PHPBB3-14855] - Update notifications and PM alert bubbles
        • +
      • [PHPBB3-14870] - Add php events to modify list of PMs
        • +
      • [PHPBB3-14872] - Remove count versus sizeof restriction in coding guidelines
        • +
      • [PHPBB3-14874] - Error on sending a .pak smiley
        • +
      • [PHPBB3-14882] - Add core event to MCP after move posts sync
        • +
      • [PHPBB3-14887] - ACP profile step 1 lang specific event
        • +
      • [PHPBB3-14918] - Provide quick access to extension version metadata
        • +
      • [PHPBB3-14940] - Add ACP template event acp_ext_details_end
        • +
      • [PHPBB3-14957] - Do not cache database config
        • +
      • [PHPBB3-14958] - Twig extension function lang() performs redundant template data copying
        • +
      • [PHPBB3-15020] - Add Events for mcp_topic_postrow_post_subject
        • +
      • [PHPBB3-15059] - Do not wrap content in code box
        • +
      • [PHPBB3-15081] - Add ACP template event acp_ext_details_notice
        • +
      • [PHPBB3-15107] - Add additional vars to event
        • +
      • [PHPBB3-15131] - Add variable to the 'core.mcp_main_modify_fork_sql' event
        • +
      • [PHPBB3-15142] - Extension Version Check Should Support Branches
        • +
      • [PHPBB3-15151] - ACP Cookie settings should contain explanatory text for all fields
        • +
      • [PHPBB3-15199] - Add core event to the function send() in the messenger
        • +
      • [PHPBB3-15200] - Allow extensions using custom templates for help/faq controllers
        • +
      • [PHPBB3-15205] - Add template events to forumlist_body.html
        • +
      • [PHPBB3-15219] - Add cron to update passwords hashes to bcrypt
        • +
      • [PHPBB3-15226] - Add index for latest topics query in feeds
        • +
      • [PHPBB3-15237] - Unguarded includes functions_user
        • +
      • [PHPBB3-15238] - Add console command to fix left/right IDs for the forums and modules
        • +
      • [PHPBB3-15241] - Add ACP template event acp_profile_contact_last
        • +
      • [PHPBB3-15250] - Add core event to MCP at the end of merge_posts
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-12545] - new pre-posting event
        • +
      • [PHPBB3-13730] - [PHP] - core.delete_post_end
        • +
      • [PHPBB3-14390] - [prosilver] - ucp_main_front_user_details_after
        • +
      • [PHPBB3-14498] - Not possible to deactivate display of "who is online" and birthdays for guests
        • +
      • [PHPBB3-14662] - [Template] - memberlist_team_username_prepend & append
        • +
      • [PHPBB3-14868] - [Template] - mcp_forum_modify_select_after
        • +
      • [PHPBB3-14996] - [event] - Add Event search_results_topictitle_after
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-13149] - [Event] - core.phpbb_log_get_topic_auth_sql_before
        • +
      +

      Task

      + +

      Changes since 3.1.9

      Bug

      From a5d83e12ec0624673ecd237e53eced4f2b8fefd5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2017 21:36:40 +0200 Subject: [PATCH 4/4] [prep-release-3.1.11] Update changelog --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 52284b32ee..a149e3d6c5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -175,6 +175,7 @@
    • [PHPBB3-15143] - version check on branch is broken
    • [PHPBB3-15146] - Date profile field validation incorrect
    • [PHPBB3-15150] - Yabber SSL/TLS certification
      • +
    • [PHPBB3-15186] - The force_delete_allowed flag does not affect actual posts deletion ability
    • [PHPBB3-15187] - ACP Template files not purged during Extension Enable
    • [PHPBB3-15246] - Memcache driver incorrectly handles Unix sockets
    • [PHPBB3-15248] - Event core.modify_posting_auth does not honor its parameters