[3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback
* nicolas-grekas/develop:
[feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback
[feature/patchwork-utf8] Remove utf8_str_replace
[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
* develop-ascraeus:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/memberlist_email.html
* prep-release-3.1.1:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
* develop-ascraeus:
[ticket/13230] Add missing globals and missing request object for path helper
[ticket/13226] Add functional test for group ranks
[ticket/13226] Fix the usage of $rank_img
* prep-release-3.1.0:
[ticket/13230] Add missing globals and missing request object for path helper
[ticket/13226] Add functional test for group ranks
[ticket/13226] Fix the usage of $rank_img
* develop-ascraeus:
[ticket/13193] Swap ternary condition members
[ticket/13193] Make template more readable
[ticket/13193] Add load_search config check
[ticket/13193] Add link to post count in PMs
[ticket/13193] Post count in PMs not a link
* Senky/ticket/13193:
[ticket/13193] Swap ternary condition members
[ticket/13193] Make template more readable
[ticket/13193] Add load_search config check
[ticket/13193] Add link to post count in PMs
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.
PHPBB3-13189
