Correct some links using ['forum_id'] instead of $forum_id.
Correctly handle from "sort by day"-viewforum when there are global
announcements displayed in the forum.
PHPBB3-9684
* develop-olympus:
[ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php
[ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
* develop-olympus:
[ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
[ticket/9751] Compare $password with empty string instead of casting it to bool
[ticket/9751] Use a switch/case block without break for password complexity.
[ticket/9751] Password requirement "Must contain letters and numbers" fails
* develop-olympus:
[ticket/10110] Remove tab from empty lines
[ticket/10110] Enable the serialization and add a constant for defined the database
[ticket/10110] Update comments with a link to the phpredis extension
[ticket/10110] Add Redis ACM backend
* develop-olympus:
[ticket/10107] Add cache to the enumeration, make statement more generic
[ticket/10107] Make it clear that provided httpd samples are not perfect
[ticket/10107] Add a webserver section to docs/INSTALL.html
* develop-olympus:
[ticket/10021] Add comment explaining why we can check -1 as an error value.
[ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
* develop-olympus:
[ticket/10096] Fixed whitespace in functions.php.
[ticket/10078] Avoid \n in strings given to echo for portability.
[ticket/10092] Ignore overlength comment lines in commit-msg hook.
* develop-olympus:
[ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
[ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
* develop-olympus:
[ticket/10046] Do not link bots to cron.php.
[ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
[ticket/10046] Call flush() in cron.php
[ticket/10046] Remove calls to register_shutdown_function() in cron.php
Conflicts:
phpBB/cron.php
phpBB/includes/functions.php
* develop-olympus:
[ticket/9970] Rename validate_language() to validate_language_iso_name().
[ticket/9970] Do not allow switching to languages not installed on reg. page.
[ticket/9970] Check whether language pack is installed.
[ticket/9970] User language input is checked for existance
* develop-olympus:
[ticket/10057] Fixes for a bunch of small problems.
[ticket/10035] ACP template edit feature allows to read any files on webserver.
[ticket/10057] Handle the case of missing interbase extension better.
[ticket/10057] Fixed wrong usage of sql_error again, in firebird.
[ticket/10057] Fixed usage of sql_error again.
[ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
[ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
[ticket/10057] Skip ibase_service_attach if firebird connection failed.
[ticket/10057] Check for interbase function existence.
[ticket/10057] Split statements in firebird dbal for readability.
[ticket/10057] Include error collector class file in postgres dbal.
[ticket/10057] Moved error collector class into its own file.
[ticket/10057] Use a class for error collection.
[ticket/10057] More informative error messages in postgres dbal.
[ticket/10057] No negative array indexing.
[ticket/10057] Report postgres db connection errors.
* ticket/igorw/9669:
[ticket/9669] Replace spaces with tabs
[ticket/9669] Switch if/else to make the if positive
[ticket/9669] Make sure normalize_nfc returns string
[ticket/9669] Add isNormalized checks for performance
[ticket/9669] Add native Normalizer support
* develop-olympus:
[ticket/9824] Accept commit messages with less than perfect headings.
[ticket/9824] Allow empty lines after ticket reference.
[ticket/9824] Use printf instead of echo to render \n.
[ticket/9824] Handle empty commit messages in commit-msg hook.
[ticket/10059] Fix two misspellings of consistent.
[ticket/9824] Add space after [ticket/12345] in prepared commit message.
[ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.