* feature/nickvergessen/unapproved-posts-in-feed:
[feature/unapproved-posts-in-feed] Little changelog correction
[feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
Conflicts:
phpBB/docs/CHANGELOG.html
* bug/nickvergessen/9512:
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
Conflicts:
phpBB/docs/CHANGELOG.html
* bug/nickvergessen/58695:
[bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
Conflicts:
phpBB/docs/CHANGELOG.html
* feature/evil3/git-tools:
[git-tools] add note about PHP_BIN using env
[git-tools] do not display stderr
[git-tools] Prepend the branch to the commit message for all branches.
[git-tools] Use env to find the correct paths to binaries.
[git-tools] Display what parse errors were found.
[git-tools] This script requires bash to run, so point directly to bash.
[git-tools] Improvements for the pre-commit hook
[git-tools] Improvements on prepare-commt-msg hook
[git-tools] Some pre-commit enhancements, abolish tempfile
[git-tools] use mktemp in pre-commit (thanks nn-)
[git-tools] pre-commit hook for syntax checking
* feature/dbal-tests:
[feature/dbal-tests] Only output the missing config error message once.
[feature/dbal-tests] Make the PDO prefix depend on the dbms.
[feature/dbal-tests] Fix whitespace and line endings.
[feature/dbal-tests] Make some tests for build_array_data on SELECT
[feature/dbal-tests] Make some tests for return_on_error on SELECT-queries
[feature/dbal-tests] Tests for $db->sql_query_limit()
[feature/dbal-tests] Load phpbb-schema after creating the connection to the database
[feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.
[feature/dbal-tests] Added database test & refactored test framework
The database base test will need a few more changes to run on all the
databases we support. But those really need to be made on a system where
they run and can be tested. Patches welcome!
The order in the FROM clause is important.
The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN.
This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
The check to avoid the double inclusion of the captcha factory class in the
garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory".
TerryE pointed the problem out, thanks!
There is now a phpbb_database_test_case which can be used as a base class for tests that require database access. You have to set up a test_config.php file in your tests/ directory containing host, user, pass etc.
Extra test functionality has been moved to phpbb_test_case_helpers to provide the same functionality in database tests and regular tests without duplicating the code. This is achieved through delegation of method calls.
