# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
This typo was added by the PRs #860 and #1178. Only the object el exists
and is correct. Due to this the text of links using the alt_text callback
were not modified while executing the callback.
PHPBB3-11313
# By Marc Alexander (2) and Callum Macrae (1)
# Via Marc Alexander
* marc1706/ticket/10949:
[ticket/10949] Remove not needed comma
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/10949] Converted AJAX coding standards to new guidelines.
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.
PHPBB3-10018
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().
PHPBB3-10018
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().
PHPBB3-10018
The `@return` documentation of the `phpbb_extension_interface::disable_step`
method states incorrect that the method returns null, as it returns
false or a state.
PHPBB3-11309
The upload avatar driver will now inform the user if insufficient data has
been entered for both remote and local avatar uploads.
The local avatar driver (gallery avatar) will also inform the user if he
didn't select a category and/or file before submitting.
PHPBB3-10018
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.
PHPBB3-10018
Rather than showing the user an empty drop-down list for the local avatar
categories, inform him/her that there are currently no (local) avatars
available.
PHPBB3-10018
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10805:
[ticket/10805] Compare phpbbAlertTimer against null
[ticket/10805] Clear loading alert timeout after ajax request finished
While registering, we should default to a given timezone. By selecting the
first timezone by default, this is fulfilled. This doesn't happen
currently, as only the "Select a timezone" selection appears.
If a user selects a timezone during the registration process we should
also make sure that the selected element is still selected; even if we
have to return to the registration page, i.e. if there was an error while
submitting the form. This is currently not the case.
With this patch the javascript code will behave correctly.
Additionally, a duplicate inclusion of timezone.js has been removed as it
was not needed.
PHPBB3-11302
The final step calls a bunch of code which expects a full phpBB
runtime environment. Also, by this step everything should be configured
and database schema set up.
Therefore, in the final step replace installer container with a normal
phpBB container.
PHPBB3-11305
The timeout for the "request timed out" popup should be cleared if it
finished. Since it is currently not cleared, the timeout alert appears as
an extra overlay if another ajaxified function is ran within 5 seconds of
the initial function call. This patch will take care of clearing the
timeout if either the success (function return_handler()) or error
(function error_handler()) functions are called.
PHPBB3-10805
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
