* develop-olympus:
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
Conflicts:
phpBB/includes/ucp/ucp_prefs.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
* Fyorl/ticket/10939:
[ticket/10939] Added documentation for phpbb_request::file
[ticket/10939] Added tests for phpbb_request::file
[ticket/10939] Modified the default return for $request->file
[ticket/10939] Modified fileupload tests to deal with new behaviour
[ticket/10939] Modified mock request class to handle deactivated $_FILES
[ticket/10939] Modified acp_groups.php to not use $_FILES
[ticket/10939] Modified ucp_groups.php to not use $_FILES
[ticket/10939] Modified functions_user.php to not use $_FILES
[ticket/10939] Modified message_parser.php to not use $_FILES
[ticket/10939] Modified functions_upload to not use $_FILES
[ticket/10939] Modified request test slightly to include $_FILES
[ticket/10939] Added $_FILES handling to phpbb_request
* nickvergessen/ticket/11018:
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
[ticket/11014] Fix text for previous/next links in Subsilver2
[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
[ticket/11018] Always display previous/next links if we can display one
[ticket/11014] Restore template vars for next/previous links
[ticket/11018] Swap prev/next links on pagination to the old order
[ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
[ticket/11018] Fix minor issues with CSS in prosilver
[ticket/11018] Attempt to fix li.pagination alignment issue
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores
phpbb_hash(htmlspecialchars(trim($password)))
Setting passwords for other auth modules is currently not supported.
Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.
PHPBB3-8713
Create a function to request variables which are not trimmed.
All requests for passwords (except forum passwords) now use the
untrimmed request function.
PHPBB3-8713
* Fyorl/feature/attach-dl: (75 commits)
[feature/attach-dl] Removed the use of some abbreviations
[feature/attach-dl] Changed $files_added checks
[feature/attach-dl] Renamed $post_id to $post_msg_id
[feature/attach-dl] Fixed a comment
[feature/attach-dl] Optimised an sql query
[feature/attach-dl] Fixed the logic in an sql statement
[feature/attch-dl] $forum_id cast to int
[feature/attach-dl] Fixed $file_added to $files_added
[feature/attach-dl] Moved definition of $archive_name
[feature/attach-dl] Swapped the order of an if statement
[feature/attach-dl] Cast variables to int
[feature/attach-dl] Added $archive_path
[feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
[feature/attach-dl] Renamed $count to $files_added
[feature/attach-dl] Removed sprintf() use
[feature/attach-dl] Removed need for array_keys()
[feature/attach-dl] Added multiple attachment downloads to PMs
[feature/attach-dl] Removed reliance on current($row)
[feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
[feature/attach-dl] Moved PM authentication handling into own function
...
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
