[ticket/12983] Correctly validate sorting options in the UCP

PHPBB3-12983
Merge pull request #2868 from rxu/ticket/12969

[ticket/12969] Add template events around username link on composing pm
Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/ucp_header.html
Merge pull request #2748 from carlo94it/ticket/12765

[ticket/12765] Use db_tools instead of generating queries at moment
Merge branch 'develop-ascraeus' into develop
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests

The mime type 'application/octet-stream' will still always be overwritten by
proper guesses. However, guesses with guessers that have a higher priority
will now overwrite previous guesses even if the mime types of these guesses
had a slash in them.

PHPBB3-13031
Merge pull request #2918 from marc1706/ticket/13031

[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
Merge branch 'develop-ascraeus' into develop

* 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/13022] Condition Return to advanced search link

PHPBB3-13022
[ticket/12983] Add functional test for ucp pref module

PHPBB3-12983
Merge pull request #2919 from Senky/ticket/12852

[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
[ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php

PHPBB3-13046
[ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event

PHPBB3-13047
[ticket/13048] Only update session_page if request is not ajax

PHPBB3-13048
[ticket/12983] Do not test invalid values until Symfony 2.4

PHPBB3-12983
Merge pull request #2925 from nickvergessen/ticket/12983

Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
Merge branch 'develop-ascraeus' into develop
Merge pull request #2928 from Nicofuma/ticket/13046

[ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php

* Nicofuma/ticket/13046:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php