* brunoais/ticket/11663:
[ticket/11663] Add the doc block about the parameters.
[ticket/11663] Add the doc block about the return value.
[ticket/11663] Make generate_text_for_storage return the errors.
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
[ticket/11974] Fix timezone names with underscores
[ticket/11974] Translate all timezones
Previously if a translator did no translate a token, it would not be
displayed. On the other hand, the translator could add additional tokens
which have no functionality. Functionality is already hardcoded into
bbcode.php so we can that in the ACP aswell, in order to prevent namend
issues.
PHPBB3-11973
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.
PHPBB3-11525
It seems like the function group_correct_avatar() was forgotten while adding
the new avatar system. We now pass the group_id 0 to the upload avatar and
let the function group_correct_avatar() fix the avatar filename after creating
the group like it was done previously.
PHPBB3-11842
The old functions phpbb_hash() and phpbb_check_hash() have been replaced with
the passwords manager service in all front-end related files. The phpBB2
converter and the release_3_0_5_rc1 migration file have not been changed.
The same applies to the security/hash_test that still tests the function
phpbb_check_hash(). This will however make sure that the old function
still works.
PHPBB3-11610
Additionally, unused variables have been removed from the globals and
the request class is now used instead of the request_var() function.
PHPBB3-11610
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".
PHPBB3-10929
Only the regular expression for MAGIC_URL_LOCAL has three capturing groups. As
a result $matches[3] is only set in this case. Prior to PHPBB3-11606 an empty
string was passed to make_clickable_callback() as a replacement in case of less
than three capturing groups. This patch reintroduces the empty string.
Regression from 49c12ef4be229bf2223139298766ef441b075fbc.
PHPBB3-11901
