makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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
This commit is contained in:
Igor Wiedler 2011-10-29 13:03:04 +02:00
commit 72a3bcd048
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/acp/acp_email.php
View file

@ -136,8 +136,9 @@ class acp_email
$i = $j = 0; $i = $j = 0;
// Send with BCC, no more than 50 recipients for one mail (to not exceed the limit) // Send with BCC
$max_chunk_size = 50; // Maximum number of bcc recipients
$max_chunk_size = (int) $config['email_max_chunk_size'];
$email_list = array(); $email_list = array();
$old_lang = $row['user_lang']; $old_lang = $row['user_lang'];
$old_notify_type = $row['user_notify_type']; $old_notify_type = $row['user_notify_type'];

5
phpBB/install/database_update.php
View file

@ -2088,6 +2088,11 @@ function change_database_data(&$no_updates, $version)
case '3.0.9-RC4': case '3.0.9-RC4':
break; 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 // Changes from 3.1.0-dev to 3.1.0-A1
case '3.1.0-dev': case '3.1.0-dev':
set_config('load_jquery_cdn', 0); set_config('load_jquery_cdn', 0);

1
phpBB/install/schemas/schema_data.sql
View file

@ -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_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_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_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 ('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_confirm', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');