diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 13:03:04 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 13:03:04 +0200 |
| commit | 72a3bcd0484460d2aeb5610762e162ca30f24263 (patch) | |
| tree | 071c631f6c057bd225b43cb7cc4af27f44dc725a | |
| parent | 5351195dd7430eb67dfa01ee76d7210f97881ebc (diff) | |
| parent | 6d913d36466a308333535963f682c07b76df9369 (diff) | |
| download | forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar.gz forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar.bz2 forums-72a3bcd0484460d2aeb5610762e162ca30f24263.tar.xz forums-72a3bcd0484460d2aeb5610762e162ca30f24263.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9307] Add config variable to installation schema.
[ticket/9307] Remove hardcoded chunk size of mass emails.
Conflicts:
phpBB/install/database_update.php
| -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 b4755d3984..c7db4f7a39 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 4c588f49cd..3d8dd9d3fa 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2088,6 +2088,11 @@ function change_database_data(&$no_updates, $version) 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; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': set_config('load_jquery_cdn', 0); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 843d6daaa7..8ba529e328 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'); |