mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus
* cs278/ticket/9307: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails.
This commit is contained in:
commit
6d913d3646
3 changed files with 9 additions and 2 deletions
|
@ -136,8 +136,9 @@ class acp_email
|
|||
|
||||
$i = $j = 0;
|
||||
|
||||
// Send with BCC, no more than 50 recipients for one mail (to not exceed the limit)
|
||||
$max_chunk_size = 50;
|
||||
// Send with BCC
|
||||
// Maximum number of bcc recipients
|
||||
$max_chunk_size = (int) $config['email_max_chunk_size'];
|
||||
$email_list = array();
|
||||
$old_lang = $row['user_lang'];
|
||||
$old_notify_type = $row['user_notify_type'];
|
||||
|
|
|
@ -1994,6 +1994,11 @@ function change_database_data(&$no_updates, $version)
|
|||
// No changes from 3.0.9-RC4 to 3.0.9
|
||||
case '3.0.9-RC4':
|
||||
break;
|
||||
|
||||
// Changes from 3.0.9 to 3.0.10-RC1
|
||||
case '3.0.9':
|
||||
set_config('email_max_chunk_size', '50');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -94,6 +94,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('delete_time', '0')
|
|||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_check_mx', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_max_chunk_size', '50');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size', '20');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
|
||||
|
|
Loading…
Add table
Reference in a new issue