* nickvergessen/ticket/bantu/11469:
[ticket/11469] Use method to check config count, instead of repeating it
[ticket/11469] Return after sql_multi_insert when multi_insert is false
[ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
* phpbb/develop:
[ticket/11476] Remove pass-by-reference from sql_mutli_insert
[ticket/11466] Remove old database driver files from PHPUnit exclude
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
[ticket/11460] Add default behaviour tests for notification and email types.
[ticket/11460] Configure functional test board email using dummy SMTP data.
[ticket/11460] Add test for whether post_email and topic_email are checked.
[ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
[ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
* github-bantu/ticket/11460:
[ticket/11460] Add default behaviour tests for notification and email types.
[ticket/11460] Configure functional test board email using dummy SMTP data.
[ticket/11460] Add test for whether post_email and topic_email are checked.
[ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
[ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
1. Tries to prevent going over max packet size by flushing to the database
after a certain number of rows have been added.
2. Because of 1., it is less likely to reach a connection timeout when
inserting a huge number of rows.
3. By flushing the buffer when a certain size is reached, memory usage should
be lower compared to building the whole insert row set first.
PHPBB3-11469
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
[ticket/11438] Add spaces after # comment start and before \ line breaks
[ticket/11438] Add helpful comments from sample config to ACP output
[ticket/11438] Add empty sql_query_pre to delta-source
[ticket/11438] Move backslash to concatenate the query strings correctly
[ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
[ticket/11404] Remove version ID from manager_test.php file header
[ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
[ticket/11404] Convert manager_test to UNIX line endings
[ticket/11404] Use a default data row if $row is empty in clean_row()
[ticket/11404] Return empty array of avatar data if $row is empty
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
[ticket/11303] rename attribute to timezone-preselect
[ticket/11303] remove additional brackets
[ticket/11303] use S_TZ_PRESELECT in subsilver
[ticket/11303] add S_TZ_PRESELECT template var
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11323:
[ticket/11323] Reduce additional code and revert regex to previous one
[ticket/11323] Enable tests for inclusion of defined variables
[ticket/11323] Correctly treat variables in template defines
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
[ticket/11390] Correctly separate list of notifications from header
[ticket/11390] Hide pagination when there are no notifications
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/10202:
[ticket/10202] Rename method names _all() to _array().
[ticket/10202] Add migration file for config_db_text.
[ticket/10202] Upgrade TEXT to the bigger MTEXT.
[ticket/10202] Improve method documentation.
[ticket/10202] SQL escape the table name.
[ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
[ticket/10202] Define phpbb_config_db_text as a service.
[ticket/10202] Add tests for phpbb_config_db_text.
[ticket/10202] Adjust method names to guidelines.
[ticket/10202] Add database schema for phpbb_config_db_text.
[ticket/10202] Implementation of config options with arbitrary length values.
While creating a group in the acp, the group data ($group_row) is empty.
Due to that array_combine in phpbb_avatar_manager::clean_row() will cause
PHP Warnings. In addition to that the required indexes 'avatar',
'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This
patch will solve that issue.
PHPBB3-11404
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
[ticket/11402] Fix undefined index in post/topic_in_queue
[ticket/11400] If email is disabled, disable it for notifications
[ticket/11398] Correctly call permission_set method in permission tool
[ticket/11394] Relax Migration Tools
[ticket/11386] Fix missing ;
[ticket/10714] Get log from container in install, update and download/file
[feature/avatars] Update module_auth of ucp module and fix small issues
[ticket/11396] Rename insert_migration to set_migration_state
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
[ticket/11393] Give more information on database updater
[ticket/11386] Send list of migrations instead of using load_migrations
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/6723] Show info that message has been deleted before delivery
[ticket/11385] Fix issue with migration module tool not getting extension module info
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
...
Conflicts:
phpBB/assets/javascript/core.js
