diff --git a/build/build.xml b/build/build.xml
index 7917b840b6..b8286f71d2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a6ad4897b3..f237605e23 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -54,6 +54,7 @@
Changes since 3.3.0-b2
Changes since 3.3.0-b1
Changes since 3.2.x
+ Changes since 3.2.9
Changes since 3.2.9-RC1
Changes since 3.2.8
Changes since 3.2.8-RC1
@@ -352,6 +353,118 @@
[PHPBB3-16185] - Use Xenial build environment on travis-ci
+ Changes since 3.2.9
+ Bug
+
+ - [PHPBB3-10506] - Not confirming "Save as Draft" strips attachments from PMs
+ - [PHPBB3-13426] - Timezone related fatal error after upgrade to 3.1.2
+ - [PHPBB3-13867] - Profile field types need an enable/disable mechanism
+ - [PHPBB3-13914] - Could not get style data via MySQL DB auto_increment_offset != 1
+ - [PHPBB3-15194] - Cannot remove group avatar in UCP (manage group)
+ - [PHPBB3-15275] - Post details: Look up IP links don't properly work
+ - [PHPBB3-15395] - Very slow FTS on PostgreSQL
+ - [PHPBB3-15438] - Use wrong word in ACP for logged administrators actions
+ - [PHPBB3-15560] - Wrong redirection upon hard delete after soft delete in viewtopic
+ - [PHPBB3-15591] - Users with disabled "Can send instant messages" permission can view jabber address
+ - [PHPBB3-15712] - Inserting an emoji in PM subject field causes errors
+ - [PHPBB3-15766] - "No role assigned...." for forum permissions is ambiguous
+ - [PHPBB3-15887] - Firefox confuses username and e-mail when storing passwords
+ - [PHPBB3-15979] - Restoring deleted post on edit does not update last post info
+ - [PHPBB3-16060] - auto-prune of shadow topics triggered by prune_all_forums updates wrong timestamp
+ - [PHPBB3-16149] - Missing profile field data
+ - [PHPBB3-16222] - Timezone suggestion in UCP
+ - [PHPBB3-16234] - Search syntax broken when using Sphinx Fulltext backend
+ - [PHPBB3-16245] - Overflow in MSSQL attempting to manage attachments when collection > 2.1 GB
+ - [PHPBB3-16289] - U_VIEW_REPORT in emails is incorrectly HTML-encoded
+ - [PHPBB3-16291] - MCP Front is missing report time
+ - [PHPBB3-16296] - Unable to delete or mark PMs in UCP folder view
+ - [PHPBB3-16310] - S_SOFTDELETE_ALLOWED condition in posting.php is wrong and causes soft delete option to appear when it should not
+ - [PHPBB3-16316] - navbar_header.html of prosilver style breaks Rich-Markup
+ - [PHPBB3-16326] - Passwort Reset - Template - missing class for new and confirm password
+ - [PHPBB3-16332] - Language strings for CODE and QUOTE are missing in the MCP post details and in the member profiles
+ - [PHPBB3-16335] - $display_cat and $download_link are undefined variables for core.parse_attachments_modify_template_data when $denied is true
+ - [PHPBB3-16339] - Poll's voting options are not fully Ajaxed
+ - [PHPBB3-16344] - phpbb_validate_email uses non-existent language keys
+ - [PHPBB3-16348] - user_ban double free of $result when banning a non-existent or disallowed username on command line
+ - [PHPBB3-16356] - Saving a draft does not delete orphaned attachments from the server
+ - [PHPBB3-16358] - Attachment tab should be removed when there are no filters
+ - [PHPBB3-16367] - Feed controller is not actually setting character set of response
+ - [PHPBB3-16377] - Undefined index navlinks in navbar_header
+ - [PHPBB3-16391] - Language file info_mcp_xxx.php from extensions should be included in ACP
+ - [PHPBB3-16399] - Emoji's in topic title cause errors
+ - [PHPBB3-16403] - Attachment icon always displayed in list of reported message
+ - [PHPBB3-16407] - S_MESSAGE_REPORTED and L_MESSAGE_REPORTED aren't defined anywhere
+ - [PHPBB3-16416] - A non-numeric value encountered in ACP attachments settings
+ - [PHPBB3-16418] - A non-numeric value encountered - ACP board start date
+ - [PHPBB3-16422] - bbcode URL tag breaking URL's?
+ - [PHPBB3-16423] - Add Aria Engine to list of Fulltext Supported
+ - [PHPBB3-16428] - Allowed schemes in links and similar fields should check field content
+ - [PHPBB3-16432] - PHP Fatal error: APCuIterator::__construct(): APC must be enabled to use APCuIterator
+ - [PHPBB3-16437] - Forum permissions don't appear for logged users who cannot post a new topic
+ - [PHPBB3-16453] - Always load permission lang files before core.permissions
+ - [PHPBB3-16467] - phpBB3 does not work with spaces in PostgreSQL database passwords
+ - [PHPBB3-16480] - Fix Emoji in report post
+ - [PHPBB3-16485] - Fix Emoji in logs for warning message
+ - [PHPBB3-16486] - Wrong configuration DB update in 3.2.0-a1 migration
+ - [PHPBB3-16487] - Wrong CDN URL for fontawesome in 3.2.0 migration
+ - [PHPBB3-16500] - Copying topics results in rearranging of inline attachments
+ - [PHPBB3-16503] - WhoIs lookup has error message in MCP
+
+ Improvement
+
+ - [PHPBB3-15370] - Spinning indicator missing when updating permissions
+ - [PHPBB3-15672] - Keep same format in Submit changes.
+ - [PHPBB3-16163] - No error message when there is no displayed post in the MCP
+ - [PHPBB3-16328] - Inform users about PHP requirements in PHP 3.3
+ - [PHPBB3-16350] - Move acp/mcp ban code to functions_admin.php
+ - [PHPBB3-16351] - Use CHMOD constants from filesystem_interface
+ - [PHPBB3-16352] - Deprecate unused functions/classes
+ - [PHPBB3-16370] - Add core events for Notification
+ - [PHPBB3-16381] - Add core event to Modify Topics SQL
+ - [PHPBB3-16383] - Add core events to modify friends list
+ - [PHPBB3-16384] - Add template events friends list username {prepend/append}
+ - [PHPBB3-16388] - Add new events in viewforum_body.html and viewtopic_body.html
+ - [PHPBB3-16406] - Event core.notification_manager_add_notifications_for_users_modify_data incorrectly placed
+ - [PHPBB3-16411] - Add vars to notification core events
+ - [PHPBB3-16421] - Add contact field icon template events to viewtopic_body.html
+ - [PHPBB3-16424] - Add base_url to generate_smilies events
+ - [PHPBB3-16425] - Add event core.generate_smilies_modify_sql
+ - [PHPBB3-16429] - Add vars to 2 ACP User core events
+ - [PHPBB3-16433] - Add data array to core.ucp_register_user_row_after
+ - [PHPBB3-16443] - Add event core.ucp_pm_compose_modify_parse_after
+ - [PHPBB3-16444] - Add event core.ucp_pm_view_message_before
+ - [PHPBB3-16446] - Add event core.message_history_modify_rowset
+ - [PHPBB3-16447] - Add event core.ucp_pm_compose_compose_pm_basic_info_query_after
+ - [PHPBB3-16448] - Add event core.mcp_get_post_data_after
+ - [PHPBB3-16450] - ACP permission tabs don't use all available space
+ - [PHPBB3-16456] - Add event core.text_formatter_s9e_get_errors
+ - [PHPBB3-16458] - Add template events to acp_profile.html
+ - [PHPBB3-16461] - Ignore .idea and node_modules
+ - [PHPBB3-16463] - Fix "acp_board.php" where "ACP_SUBMIT_CHANGES" is not displayed.
+ - [PHPBB3-16468] - Amend DocBlocks for user_delete()
+ - [PHPBB3-16494] - Update composer and composer dependencies
+
+ New Feature
+
+ - [PHPBB3-16329] - Strip Exif metadata from uploaded image attachments
+ - [PHPBB3-16330] - Enable ACP option to specify image compression level
+
+ Sub-task
+
+ - [PHPBB3-16233] - Enable exact phrase searching with Sphinx Fulltext
+
+ Task
+
+ - [PHPBB3-15609] - Discrepancy and bugs between moderation queue and reports
+ - [PHPBB3-16121] - Add footer-row to simple_footer.html
+ - [PHPBB3-16122] - RANK_IMG, GROUP_RANK and RANK_TITLE variables are useless in some template files
+ - [PHPBB3-16392] - Update composer & dependencies
+ - [PHPBB3-16415] - Use API token for appveyor builds
+ - [PHPBB3-16419] - Add mrgoldy to CREDITS.txt
+ - [PHPBB3-16496] - The help line text for custom BBcode could be wrongly displayed
+ - [PHPBB3-16506] - Update credits to latest state
+
+
Changes since 3.2.9-RC1
Bug
diff --git a/phpBB/phpbb/db/migration/data/v32x/v3210rc1.php b/phpBB/phpbb/db/migration/data/v32x/v3210rc1.php
new file mode 100644
index 0000000000..283e5ca928
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v32x/v3210rc1.php
@@ -0,0 +1,38 @@
+
+* @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 v3210rc1 extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return phpbb_version_compare($this->config['version'], '3.2.10-RC1', '>=');
+ }
+
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v32x\v329',
+ '\phpbb\db\migration\data\v32x\add_plupload_config',
+ '\phpbb\db\migration\data\v32x\font_awesome_update_cdn',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.2.10-RC1')),
+ );
+ }
+}