aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-31 02:04:54 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-31 02:04:54 +0200
commitc8bb9a2d37babae707a2006b8027e96d5758d940 (patch)
tree23334c289c38159272ff486fcfb62b4cbf358772
parent18079d01b3af59015c0e65ca03e797c30a48f223 (diff)
parent2f312b2175fd0ff13cb18d499b01a7092a2ad4d4 (diff)
downloadforums-c8bb9a2d37babae707a2006b8027e96d5758d940.tar
forums-c8bb9a2d37babae707a2006b8027e96d5758d940.tar.gz
forums-c8bb9a2d37babae707a2006b8027e96d5758d940.tar.bz2
forums-c8bb9a2d37babae707a2006b8027e96d5758d940.tar.xz
forums-c8bb9a2d37babae707a2006b8027e96d5758d940.zip
Merge branch 'ticket/jellydoughnut/9559' into develop-olympus
* ticket/jellydoughnut/9559: [ticket/9559] Do not override queue package size in the case of an overflow
-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)
{