* 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
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
References are not really needed in PHP due to copy-on-write. Since
PHP5, objects are always passed around as identifiers, which means they
are mutable. So it is no longer required to pass these by reference
either.
PHPBB3-9608
The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.
PHPBB3-10258
Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.
Also introduce a global /assets directory for assets that are shared
between styles.
PHPBB3-10155
The template stream filter no longer depends on the $config global.
Instead it uses a 'allow_php' param that is passed via
stream_bucket_append's last argument.
Tests also adjusted.
PHPBB3-9726
* develop-olympus:
[ticket/10250] The site_logo hash is different depending on imageset & language
[ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
[ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
[ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
* prep-release-3.0.9:
[ticket/10250] The site_logo hash is different depending on imageset & language
[ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
[ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
[ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
* naderman/ticket/10250:
[ticket/10250] The site_logo hash is different depending on imageset & language
[ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
[ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
[ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
* develop-olympus:
[ticket/9859] Changing all phpBB footers to match the new credit line
[ticket/9859] New footer copyright line with registered symbol
* prep-release-3.0.9:
[ticket/9859] Changing all phpBB footers to match the new credit line
[ticket/9859] New footer copyright line with registered symbol
The new logo is slightly wider than the old logo. If we changed the size in the
imageset.cfg we would cause a conflict for everyone who replaced the logo with
their own and modified the size. Instead we overwrite the width and height in
the img() function in session.php only if its contents are that of the stock
phpbb logo.
PHPBB3-10250
