* develop-olympus:
[ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
[ticket/10257] Fix AAAA record parsing for old versions of Windows
[ticket/10257] Add missing break statement after CNAME block.
* github-bantu/ticket/10257:
[ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
[ticket/10257] Fix AAAA record parsing for old versions of Windows
[ticket/10257] Add missing break statement after CNAME block.
* develop-olympus:
[ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
[ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
[ticket/10263] Adding unit tests for phpbb_version_compare().
[ticket/10263] Add wrapper for version_compare() that allows the use of A and B
* github-bantu/ticket/10263:
[ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
[ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
[ticket/10263] Adding unit tests for phpbb_version_compare().
[ticket/10263] Add wrapper for version_compare() that allows the use of A and B
* develop-olympus:
[ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
[ticket/10243] Call phpbb_gmgetdate() from various places.
[ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
* github-bantu/ticket/10243:
[ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
[ticket/10243] Call phpbb_gmgetdate() from various places.
[ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
* develop-olympus:
[ticket/10237] Also display login-box on subscribing
[ticket/10237] Handle watching and unwatching the same way.
[ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
Conflicts:
phpBB/includes/functions_display.php
* github-nickvergessen/ticket/10237:
[ticket/10237] Also display login-box on subscribing
[ticket/10237] Handle watching and unwatching the same way.
[ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.
Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.
PHPBB3-9716
Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission.
PHPBB3-10252
Also fixes PHPBB3-6458 "Width of Topics and Posts columns in Board Index is causing problems with language packs" by increasing the size to 90px instead of the ~70 it was like. Also tested on RTL languages.
PHPBB3-6458
PHPBB3-6632
The fix is copied from view_inactive_users().
Also add keywords and sort parameters to url for deleting logs and inactive users.
And finally save some queries if there are no logs/users to display anyway