From d2acccf92ccbb0d37eaa4f1158417e548a3ac575 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 12 Dec 2015 01:31:31 +0100 Subject: [PATCH 1/3] [prep-release-3.1.7] Update version to 3.1.7-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 2d1a6eb51a..85669713c3 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 ab943c2f86..1a2455f593 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.7-dev'); +define('PHPBB_VERSION', '3.1.7-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 3a5e58cabd..56bc23c32d 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.6', + 'phpbb_version' => '3.1.7', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 1b6766e1b1..efc815a852 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.7-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.7-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 13433c389f..f1a34bcf68 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.6 -phpbb_version = 3.1.6 +style_version = 3.1.7 +phpbb_version = 3.1.7 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 8077c1d51e..77cea1a55f 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.6 -phpbb_version = 3.1.6 +style_version = 3.1.7 +phpbb_version = 3.1.7 # Defining a different template bitfield # template_bitfield = lNg= From 69cf32613dbc9605cea0d06d4e98a7beb79e850b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 12 Dec 2015 01:35:05 +0100 Subject: [PATCH 2/3] [prep-release-3.1.7] Add migration for 3.1.7-RC1 --- .../phpbb/db/migration/data/v31x/v317rc1.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v31x/v317rc1.php diff --git a/phpBB/phpbb/db/migration/data/v31x/v317rc1.php b/phpBB/phpbb/db/migration/data/v31x/v317rc1.php new file mode 100644 index 0000000000..fa24819094 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v317rc1.php @@ -0,0 +1,32 @@ + +* @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 v317rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\m_pm_report', + '\phpbb\db\migration\data\v31x\v316', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.7-RC1')), + ); + } +} From 099a1b5f7535b0bef786b241e967bd71e4d91dbf Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 12 Dec 2015 01:37:56 +0100 Subject: [PATCH 3/3] [prep-release-3.1.7] Add changelog for 3.1.7-RC1 --- phpBB/docs/CHANGELOG.html | 108 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b1db7b6f36..a59ea31509 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,6 +49,7 @@
  1. Changelog
      +
    • Changes since 3.1.6
    • Changes since 3.1.5
    • Changes since 3.1.4
    • Changes since 3.1.3
      • @@ -113,6 +114,113 @@
      +

      Changes since 3.1.6

      + +

      Bug

      +
        +
      • [PHPBB3-8839] - Wrong new status of subforumlink on index
        • +
      • [PHPBB3-8920] - PM-Report for every moderator
        • +
      • [PHPBB3-9153] - New member can delete pm just in one way
        • +
      • [PHPBB3-9252] - Conflict when (dis)approving a post by two moderators at the same time
        • +
      • [PHPBB3-11468] - Controllers can not set additional parameters of page_header()
        • +
      • [PHPBB3-11971] - Validating not correctly in Spambot countermeasures
        • +
      • [PHPBB3-12616] - Report notification is not removed when post is disapproved or deleted
        • +
      • [PHPBB3-13202] - dead code in sessions.php
        • +
      • [PHPBB3-13423] - Driver sqlite3 failed periodically
        • +
      • [PHPBB3-13636] - Unexpect return to previous page behaviour
        • +
      • [PHPBB3-13656] - database_upgrade.php fails when database password contains a % character
        • +
      • [PHPBB3-13748] - Wrong tooltip after poll vote change
        • +
      • [PHPBB3-13759] - submit_post doesn't take $data['post_time'] - into account
        • +
      • [PHPBB3-13799] - Avatar gallery subfolders paths are handled incorrectly
        • +
      • [PHPBB3-13831] - Post deletion reason is not appearing on moderation logs
        • +
      • [PHPBB3-13835] - File upload of large files where filename contains umlauts fails
        • +
      • [PHPBB3-13846] - Permissions around soft deleting are inconsistently handled
        • +
      • [PHPBB3-13851] - "Can ignore flood limit" permission not taking effect
        • +
      • [PHPBB3-13892] - "Someone reports a post" notification setting has no effect
        • +
      • [PHPBB3-13945] - Account re-activation does not create a notification
        • +
      • [PHPBB3-13950] - If disabled extension - no hidden permission set
        • +
      • [PHPBB3-13960] - Profile field validation may break
        • +
      • [PHPBB3-13976] - Fix comment typo in salted_md5 driver
        • +
      • [PHPBB3-13988] - Atom feeds use relative links for image attachments
        • +
      • [PHPBB3-13992] - Fix html5 error from output on w3.org its new validator
        • +
      • [PHPBB3-14058] - subsilver2 Contact us form doesn't have an email subject field
        • +
      • [PHPBB3-14070] - Disabled avatar types is still displayed on the forum
        • +
      • [PHPBB3-14106] - Sorting is unworkable while moderating forum (merge topics)
        • +
      • [PHPBB3-14114] - Inconsistency in install.html in 3.1.x Automatic uopdate package
        • +
      • [PHPBB3-14127] - Error in the BBCode FAQ in 'Linking to another site'
        • +
      • [PHPBB3-14142] - Remove unused ignore_configs from avatar drivers
        • +
      • [PHPBB3-14143] - Flush the in-memory mail queue when writing it to the disk
        • +
      • [PHPBB3-14153] - Notifications dropdown header doesn't clear floats
        • +
      • [PHPBB3-14159] - Not accessible link on main ACP page
        • +
      • [PHPBB3-14161] - The core.download_file_send_to_browser_before - $vars - 'extension' it does not exist
        • +
      • [PHPBB3-14163] - Select All in code bug in Edge
        • +
      • [PHPBB3-14181] - Custom report/denial reason not shown in user notifications
        • +
      • [PHPBB3-14186] - Incorrect string concatenation in phpbb_mcp_sorting()
        • +
      • [PHPBB3-14200] - Allow hidden users to see theself on viewonline
        • +
      • [PHPBB3-14215] - [ticket/14212] - Adding event after users have been removed to a group
        • +
      • [PHPBB3-14217] - [ticket/13591] - Change SQL query into array to allow
        • +
      • [PHPBB3-14224] - Fix trailing whitespaces
        • +
      • [PHPBB3-14228] - Vertical align of numbers in polls
        • +
      • [PHPBB3-14236] - Race condition in the functional tests
        • +
      • [PHPBB3-14242] - Fix on memberlist the sort method.
        • +
      • [PHPBB3-14249] - Online list isn't sorted anymore
        • +
      • [PHPBB3-14258] - Add event in auth::Login
        • +
      • [PHPBB3-14271] - Update nginx sample config
        • +
      • [PHPBB3-14276] - Function get_folder_status not setup for use of plurals
        • +
      • [PHPBB3-14287] - Loading indicator not removed after confirming action that does not produce a message
        • +
      • [PHPBB3-14297] - Uppercase and lowercase when sorting topics
        • +
      • [PHPBB3-14334] - Do not use deprecated function get_user_avatar() in user_loader
        • +
      • [PHPBB3-14339] - State support for PHP 7.0 in docs
        • +
      • [PHPBB3-14346] - Improve version check output when phpbb.com is unreachable
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-7362] - Title/Post Icons Need Attribute Text
        • +
      • [PHPBB3-8800] - Add "mark topics read" link to "View unread posts"
        • +
      • [PHPBB3-10343] - ACP: searching for users does not show inactive accounts
        • +
      • [PHPBB3-13684] - Only resize attached file comments vertically
        • +
      • [PHPBB3-13934] - Enctype clause for forms may be needed for profile fields
        • +
      • [PHPBB3-14066] - Add template events to search_body.html
        • +
      • [PHPBB3-14073] - Add core events to the several places in includes/functions_admin.php
        • +
      • [PHPBB3-14075] - Event in posting preview
        • +
      • [PHPBB3-14080] - Add template events to viewforum_body.html before/after/append/prepend the topic row
        • +
      • [PHPBB3-14088] - Add core events to the search.php
        • +
      • [PHPBB3-14089] - [Template] - posting_topic_title_after
        • +
      • [PHPBB3-14098] - Add core events to the search backends (fulltext_*.php)
        • +
      • [PHPBB3-14102] - Add core event to the mcp_topic.php
        • +
      • [PHPBB3-14113] - Add core events to the memberlist.php for customizing members search
        • +
      • [PHPBB3-14117] - Add core events to index.php to allow modifying birthdays list
        • +
      • [PHPBB3-14123] - Add more descriptive help to the CLI commands
        • +
      • [PHPBB3-14126] - Add viewtopic_topic_title_after template event
        • +
      • [PHPBB3-14133] - Comment fix for phpbb_get_user_rank()
        • +
      • [PHPBB3-14154] - Include "Clean Name" for disabled Extensions
        • +
      • [PHPBB3-14155] - Add row highlighting to extensions and style management
        • +
      • [PHPBB3-14156] - Add the Symfony ResponseListener
        • +
      • [PHPBB3-14164] - Helpful instructions for database updates
        • +
      • [PHPBB3-14170] - Fix mcp_change_poster_after event
        • +
      • [PHPBB3-14201] - Add ACP template events
        • +
      • [PHPBB3-14213] - [PHP] - core.group_add_user_after
        • +
      • [PHPBB3-14219] - Add email address into inactive user display in ACP
        • +
      • [PHPBB3-14261] - Pages served from app.php can't disable the update of session_page
        • +
      • [PHPBB3-14283] - Add a "Manage Group" link on a group page
        • +
      • [PHPBB3-14313] - Don't display quote button on unapproved posts
        • +
      • [PHPBB3-14343] - Add event when locking/unlocking posts/topics
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-14144] - [Template] - quickreply_editor_subject_before
        • +
      • [PHPBB3-14146] - [Template] - viewtopic_body_post_subject_before
        • +
      • [PHPBB3-14187] - [ACP Template] - acp_styles_before_table
        • +
      • [PHPBB3-14188] - [PHP] - core.acp_styles_action_before
        • +
      • [PHPBB3-14191] - [PHP] - core.get_gravatar_url_after
        • +
      • [PHPBB3-14192] - [PHP] - core.memberlist_memberrow_before
        • +
      +

      Task

      +
        +
      • [PHPBB3-14140] - Update Symfony to benefit from improvement to the console component
        • +
      + +

      Changes since 3.1.5

      Bug