* develop-olympus:
[ticket/9509] Remove section 8 from index
[ticket/9509] Close anchor tag in coding guidelines
[ticket/9854] Revise docs/auth_api.html to add more methods
[ticket/9509] The VCS is now git
[ticket/9840] Display view unread posts link for guests.
Conflicts:
phpBB/docs/coding-guidelines.html
* develop-olympus:
[ticket/9820] phpBB Debug Error when trying to post a new topic.
[ticket/9162] BBCode in poll options is broken, when posting without question.
[ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
* develop-olympus:
[task/git-tools] Change the GNU --lines argument to the POSIX -l
[task/git-tools] Solve dependency on the GNU wc --max-line-length option
[ticket/8944] Patch db_tools to support index length for MySQL4
[ticket/9039] Make mssqlnative.php non-executable
[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
[ticket/9800] Update tracker URL in docs/README.html
* develop-olympus:
[ticket/9704] Fix minor typo in coding guidelines.
[ticket/9690] Add forthcoming Bing Bot to list of recognized bots
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
[ticket/9593] A readme file for unit tests and running unit tests.
[ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
[ticket/9589] Added sample nginx configuration file for phpbb.
- Class names need to be prefixed with phpbb_
- eval should not be used in any form
- there should be newlines at the end of file
- the closing php tag should be ommited
- array elements should always have a trailing comma
- the phpBB VCS is now git
- removed the coding guidelines changelog
PHPBB3-9557
* 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
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!
Previously search robots could stumble upon a board link somewhere on the web
containing a SID they'd follow it and end up indexing that page with the SID
in the request URI, this fix prevents that by redirecting them to the same URI
just without the SID.