* develop-olympus:
[ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
[ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.
Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.
PHPBB3-9999
* develop-olympus:
[ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
[ticket/10003] Ported 1802b9ff92 to db_tools.
[ticket/10003] Ported 5553cfc2ed to db_tools.
[ticket/10003] Ported 023760c8b2 to db_tools.
[ticket/10003] Ported 54c22ae52a to db_tools.
[ticket/10003] Ported 96a30afcca to db_tools.
[ticket/10003] Ported d7d96223e7 to db_tools.
* ticket/p/10003:
[ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
[ticket/10003] Ported 1802b9ff92 to db_tools.
[ticket/10003] Ported 5553cfc2ed to db_tools.
[ticket/10003] Ported 023760c8b2 to db_tools.
[ticket/10003] Ported 54c22ae52a to db_tools.
[ticket/10003] Ported 96a30afcca to db_tools.
[ticket/10003] Ported d7d96223e7 to db_tools.
* feature/rxu/attachment-management-no-reassignment:
[feature/attachment-management-no-reassignment] Handle privacy and some more.
[feature/attachment-management-no-reassignment] Further feature adjustments.
[feature/attachment-management-no-reassignment] Fix some more errors
[feature/attachment-management-no-reassignment] Fix minor flaws in the code.
[feature/attachment-management-no-reassignment] Attachments management
- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.
PHPBB3-9721
* 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.
* Create log entries when a user activates own account without
also changing their password.
* Additionally create admin log entries when an administrator activates
user accounts.
PHPBB3-9961
* 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.
