* develop-olympus:
[ticket/10141] Save a hash lookup when value is not in cache.
[ticket/10141] Split double-assignment into conditional and unconditional part.
[ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
* ticket/rxu/10117:
[ticket/10117] Add one more missed 'u' modifier, add code comment
[ticket/10117] Make smilies to be correctly parsed within unicode text.
* ticket/rxu/10115:
[ticket/10115] Switch UTF-8 mode on for the rest of BBCodes
[ticket/10115] Make some text oriented BBCodes to properly handle unicode.
* ticket/nickvergessen/9684:
[ticket/9684] Also display forum-name in subsilver2 template
[ticket/9684] Move currently existing GAs to a selectable forum while updating.
[ticket/9684] View origin-forumname for GAs in topic-list
[ticket/9684] Fix Forum/Topic-Tracking for global announcements
[ticket/9684] Fix a SQL-Error in the posting.php
[ticket/9684] Remove code in some more files especially includes/
[ticket/9684] Remove code for global announcement in root-files
* develop-olympus:
[ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
[ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
The user_ban() function is shared by the MCP and the ACP.
Mark trigger_error() calls as errors by passing E_USER_WARNING to make the
error message appear on red background (instead of green background) in the
ACP.
PHPBB3-10128
* 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
* ticket/bantu/9751:
[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
Add shortcut logic for pass_complex because this is the default value phpBB
ships with and there is nothing to do in that function in that case.
PHPBB3-9751
* ticket/haklop/10110:
[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