* develop-olympus:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* prep-release-3.0.11:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* github-nickvergessen/ticket/10950:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* Fyorl/ticket/10992:
[ticket/10992] Changed octetstream to octet-stream
[ticket/10992] test_empty_file() now tries to upload the correct file
[ticket/10992] Modified upload tests to work with new version
* develop-olympus:
[ticket/10981] Added check for PHP version before running composer
[ticket/10981] Modified travis to use composer with --dev
[ticket/10981] Removed setupBeforeClass
[ticket/10981] Modified functional framework to account for goutte changes
[ticket/10981] Added goutte via composer
Conflicts:
.travis.yml
composer.phar
phpBB/composer.json
phpBB/composer.lock
tests/bootstrap.php
* Fyorl/ticket/10981:
[ticket/10981] Added check for PHP version before running composer
[ticket/10981] Modified travis to use composer with --dev
[ticket/10981] Removed setupBeforeClass
[ticket/10981] Modified functional framework to account for goutte changes
[ticket/10981] Added goutte via composer
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.
PHPBB3-9558
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
