* develop-ascraeus:
[ticket/12755] Apply de morgan to conditional
[ticket/12755] Terminate upload loop if upload reaches filesize
[ticket/12755] Change upload in remote_upload() method to fit get_remote_file
[ticket/12755] Add language string for timed out remote upload
[ticket/12755] Add timeout to remote upload to prevent infinite loop
* develop-olympus:
[ticket/12755] Apply de morgan to conditional
[ticket/12755] Terminate upload loop if upload reaches filesize
[ticket/12755] Change upload in remote_upload() method to fit get_remote_file
[ticket/12755] Add language string for timed out remote upload
[ticket/12755] Add timeout to remote upload to prevent infinite loop
Terminate the upload loop if the expected filesize has been reached instead
of trying to read more bytes until the timeout has been reached.
PHPBB3-12755
* develop-ascraeus:
[ticket/12612] Prefix check_ids() with phpbb_
[ticket/12612] Prefix mcp_sorting() with phpbb_
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
[ticket/12612] Prefix module url functions with phpbb_
[ticket/12612] Prefix upload_popup() with phpbb_
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
[ticket/12612] Prefix custom UCP module function with phpbb_
[ticket/12612] Prefix _sort_last_active() with phpbb_
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
The variable $mimetype is not used in the method local_upload() afterwards
so it shouldn't be assigned. The correct default mimetype should be
application/octet-stream and not application/octetstream according to RFC 2046.
PHPBB3-11148
The mimetype guesser will be used to get the mimetype of uploaded files.
Until now, this was only used for files uploaded with plupload. If a file
doesn't have a mimetype supplied, we will now try to get the correct mimetype.
PHPBB3-11148
* develop-ascraeus:
[ticket/12690] Find a space
[ticket/12690] Remove $msg_id and chmod
[ticket/12690] Add other info to core.submit_pm_after
[ticket/12690] Add core.submit_pm_after event
[ticket/12690] Add core.submit_pm_after event
* lucifer4o/ticket/12690:
[ticket/12690] Find a space
[ticket/12690] Remove $msg_id and chmod
[ticket/12690] Add other info to core.submit_pm_after
[ticket/12690] Add core.submit_pm_after event
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
[ticket/12563] Adds « and » to the links in acp_styles.php
[ticket/12563] Removes ending . from <a>
[ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
[ticket/12563] Changes 2 language variables to better understandable names
* develop-ascraeus:
[ticket/12612] Move functions from mcp.php to functions_mcp.php
[ticket/12612] Move function from ucp.php to functions_user.php
[ticket/12612] Move functions from memberlist.php to functions_display.php
[ticket/12612] Move functions from posting.php to functions_posting.php
* github-nickvergessen/ticket/12612-ascraeus:
[ticket/12612] Move functions from mcp.php to functions_mcp.php
[ticket/12612] Move function from ucp.php to functions_user.php
[ticket/12612] Move functions from memberlist.php to functions_display.php
[ticket/12612] Move functions from posting.php to functions_posting.php
[ticket/12747] Drop support for Firebird
* nickvergessen/ticket/12747:
[ticket/12747] Remove some methods which are not used anymore
[ticket/12747] Drop support for Firebird
Conflicts:
phpBB/phpbb/db/driver/firebird.php
[ticket/12704] Improve the load time information in the footer when enabled
* rxu/ticket/12704:
[ticket/12704] Improve the load time information in the footer when enabled
[Ticket/12701] Add events to user_add function
* lucifer4o/ticket/12701:
[ticket/12701] Add change
[ticket/12701] Rmove before event and expand modify_data
[ticket/12701] Add events to user_add function
Add two new events to user_add function
in ./includes/functions_user.php.
core.user_add_before - allow modification of
submitted to function data.
Returns:
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array
core.user_add_after - return user_id, user_row and
cp_data after user registration
Returns:
@var int $user_id - user_id of the new user
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array
Justification:
Allow extensions to parse data before and after
creation of the user.
PHPBB3-12701
Add core.delete_pm to funtion delete_pm.
Event will return:
int $user_id - ID of the user requested the message delete
array $msg_ids - array of all messages to be deleted
int $folder_id - ID of the user folder where the messages are stored
Justification:
Allow extensions to capture this event
and act as intended by ext author
PHPBB3-12691
