* develop-olympus:
[ticket/10897] Combine bot updates and bot delete.
[ticket/10897] Use same code/query for deleting.
[ticket/10897] Make sure the user we're fetching is a bot.
[ticket/10897] Do not handle IP address. There is no need.
[ticket/10897] Update by user_id instead of bot_name.
[ticket/10897] Move bot delete data to the relevant foreach loop.
[ticket/10897] Add comment about what's going on.
[ticket/10897] Remove unnecessary string casting.
[ticket/10897] Add space after foreach.
[ticket/10897] Update bots during phpBB update
[ticket/10897] Bot list updated
* bantu/ticket/10897:
[ticket/10897] Combine bot updates and bot delete.
[ticket/10897] Use same code/query for deleting.
[ticket/10897] Make sure the user we're fetching is a bot.
[ticket/10897] Do not handle IP address. There is no need.
[ticket/10897] Update by user_id instead of bot_name.
[ticket/10897] Move bot delete data to the relevant foreach loop.
[ticket/10897] Add comment about what's going on.
[ticket/10897] Remove unnecessary string casting.
[ticket/10897] Add space after foreach.
[ticket/10897] Update bots during phpBB update
[ticket/10897] Bot list updated
* github-p/ticket/11174:
[ticket/11174] Check common words, fix array equality assertion.
[ticket/11174] Test for common words.
[ticket/11174] More tests.
[ticket/11174] Clarify why that is the way it is.
[ticket/11174] Started on search tests - keyword splitting.
'Baidu [Spider]' updated.
'Bing [Bot]' fixed only identation.
'Exabot [Bot]' changed because there is used also 'Exabot-Thumbnails'
user agent.
'NG-Search [Bot]' no longer exists.
'Nutch/CVS [Bot]' is the same of 'Nutch [Bot]'.
'OmniExplorer [Bot]' no longer exists.
'Seekport [Bot]' no longer exists.
'Synoo [Bot]' no longer exists.
'Voyager [Bot]' updated.
'W3C [Validator]' corrected (there was a *).
'WiseNut [Bot]' no longer exists.
PHPBB3-10897
* github-p/feature/prune-users: (21 commits)
[feature/prune-users] $author_id_sql is no longer needed here.
[feature/prune-users] Move quote to the correct line.
[feature/prune-users] Split one line into two lines for readability.
[feature/prune-users] Use empty for checking array size.
[feature/prune-users] Fix issues with queries pointed out by bantu.
[feature/prune-users] Add spaces inside brackets.
[feature/prune-users] Use a map instead of performing array scans.
[feature/prune-users] Fix incorrect condition when deleting log entries.
[feature/prune-users] Non-cosmetic changes per bantu's review.
[feature/prune-users] Cosmetic changes per bantu's review.
[feature/prune-users] Minor UI adjustment and bug fixes
[feature/prune_users] Moved set_config_count out of user loop.
[feature/prune-users] Fixed user id check in undelivered users loop.
[feature/prune-users] Call sql_is_set once for author ids in user_delete.
[feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.
[feature/prune-users] Call sql_is_set for user ids once in user_delete.
[feature/prune-users] Fixed whitespace in language file.
[feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.
[feature/prune-users] Adjust some language strings for new features
[feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.
...
* 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
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
