* develop-ascraeus:
[ticket/13019] Do not hide reason field when deleting permanently.
[ticket/13019] Rename deletion reason label.
[ticket/13019] Always accept a reason for deleting a post/topic.
[ticket/13005] Add event to display_forums() to modify category template data
* rxu/ticket/13005:
[ticket/13005] Add event to display_forums() to modify category template data
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
* rxu/ticket/13006:
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
* develop-ascraeus:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
Conflicts:
phpBB/styles/subsilver2/template/ucp_attachments.html
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
* nickvergessen/ticket/12976:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
* develop-ascraeus:
[ticket/13052] Use request class instead of $_POST and request_var()
[ticket/13052] Fix appearances with multiple parameters
[ticket/13052] Remove additional parameter from check_form_key()
* develop-ascraeus:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
[ticket/13031] Only use mimetype guesser guess if it helps us
* marc1706/ticket/13031:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.
PHPBB3-13031
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
[ticket/12966] Sort by post_time and post_id where applicable
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
Add $quickmod and $action variables
for the 'core.modify_quickmod_actions' event trigerring
to avoid of using global operator in corresponding extensions.
PHPBB3-13006
