[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
This commit is contained in:
Josh Woody 2010-07-22 10:44:31 -05:00
parent b7ae0fe4e9
commit 2f312b2175

View file

@ -671,11 +671,18 @@ class queue
$package_size = $data_ary['package_size']; $package_size = $data_ary['package_size'];
$num_items = (!$package_size || sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $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 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) if (sizeof($data_ary['data']) > $package_size * 2.5)
{ {
$num_items = sizeof($data_ary['data']); $num_items = sizeof($data_ary['data']);
} }
*/
switch ($object) switch ($object)
{ {