aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-22 10:44:31 -0500
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-22 10:44:31 -0500
commit2f312b2175fd0ff13cb18d499b01a7092a2ad4d4 (patch)
treecdd4d21ba30e7c2f517a66a1f3ba504381c12709 /phpBB/includes/functions_messenger.php
parentb7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739 (diff)
downloadforums-2f312b2175fd0ff13cb18d499b01a7092a2ad4d4.tar
forums-2f312b2175fd0ff13cb18d499b01a7092a2ad4d4.tar.gz
forums-2f312b2175fd0ff13cb18d499b01a7092a2ad4d4.tar.bz2
forums-2f312b2175fd0ff13cb18d499b01a7092a2ad4d4.tar.xz
forums-2f312b2175fd0ff13cb18d499b01a7092a2ad4d4.zip
[ticket/9559] Do not override queue package size in the case of an overflow
This reverts r8025 to includes/functions_messenger.php. That code caused problems on hosters with email limits less than package_size*2.5. And it isn't desirable in general to over-ride the admin's configuration options. PHPBB3-9559
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
-rw-r--r--phpBB/includes/functions_messenger.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 99883cd9ca..bb0d88ec1b 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -671,11 +671,18 @@ class queue
$package_size = $data_ary['package_size'];
$num_items = (!$package_size || sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size;
+ /*
+ * This code is commented out because it causes problems on some web hosts.
+ * The core problem is rather restrictive email sending limits.
+ * This code is nly useful if you have no such restrictions from the
+ * web host and the package size setting is wrong.
+
// If the amount of emails to be sent is way more than package_size than we need to increase it to prevent backlogs...
if (sizeof($data_ary['data']) > $package_size * 2.5)
{
$num_items = sizeof($data_ary['data']);
}
+ */
switch ($object)
{