aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_email.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-10-29 13:03:04 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-10-29 13:03:04 +0200
commit72a3bcd0484460d2aeb5610762e162ca30f24263 (patch)
tree071c631f6c057bd225b43cb7cc4af27f44dc725a /phpBB/includes/acp/acp_email.php
parent5351195dd7430eb67dfa01ee76d7210f97881ebc (diff)
parent6d913d36466a308333535963f682c07b76df9369 (diff)
downloadforums-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
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
-rw-r--r--phpBB/includes/acp/acp_email.php5
1 files changed, 3 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'];