* brunoais/ticket/10845:
[ticket/10845] Removed one empty line that wasn't supposed to be there
[ticket/10845] Two of the three colouns were missing in the DB update file
[ticket/10845] Remove censor from text
[ticket/10845] Now it shows the preview post parsed
[ticket/10845] Changed the report system. Now it saves posts with the bbcode
Conflicts:
phpBB/includes/functions_content.php
* github-phpbb/develop-olympus:
[ticket/11159] static public is the currently approved order.
Conflicts:
tests/dbal/select_test.php
tests/dbal/write_test.php
tests/request/request_var_test.php
tests/security/extract_current_page_test.php
tests/security/redirect_test.php
tests/template/template_test.php
tests/text_processing/make_clickable_test.php
tests/utf/utf8_clean_string_test.php
* upstream/develop: (2171 commits)
[ticket/11164] Update composer.phar
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
[ticket/11099] Mark acp_ban::display_ban_options() as static.
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
[ticket/11159] static public is the currently approved order.
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
[ticket/10848] Move include up.
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
...
Conflicts:
phpBB/includes/functions_user.php
template_path is now private.
Change semantics of passing false for template path - now this resets
template path to default which I think makes sense.
PHPBB3-10933
This was probably necessary all along, and the test happened to work
because state was not correctly reset between test runs and
a previous test set an empty template path.
PHPBB3-10933
There is no apparent reason for either initializing or clearing
the context in set_style/set_custom_style.
Initially the initialization there was added in
0501640d5d, for reasons that
presently I do not see.
This permits making context property back private.
PHPBB3-10933
* p/ticket/11157:
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
* 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
* EXreaction/ticket/8796:
[ticket/8796] Prevent setting post_time greater than time() in markread
[ticket/8796] Fix a few issues with the previous commits
[ticket/8796] Mark read links updated to include time() in url
[ticket/8796] Revert changes to $user->data['lastmark']
[ticket/8796] Make function markread obey the $post_time argument
