diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 13:01:03 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 13:01:03 +0200 |
| commit | 6d913d36466a308333535963f682c07b76df9369 (patch) | |
| tree | 21f0069109037f675365a23a50e8e3ed5e0e62e2 | |
| parent | 319d12bedfecfaa352c4b21cbce471b348ead3bb (diff) | |
| parent | 81f9385477e1a6b050f447c9659faaf0bc7e871a (diff) | |
| download | forums-6d913d36466a308333535963f682c07b76df9369.tar forums-6d913d36466a308333535963f682c07b76df9369.tar.gz forums-6d913d36466a308333535963f682c07b76df9369.tar.bz2 forums-6d913d36466a308333535963f682c07b76df9369.tar.xz forums-6d913d36466a308333535963f682c07b76df9369.zip | |
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.
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 5 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 5 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 133fe47e09..e98b7a19a5 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -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']; diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a167e79308..21246a215e 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 153ac61157..84b25d676e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -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'); |