aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-11-10 15:58:12 +0100
committerNils Adermann <naderman@naderman.de>2010-11-10 15:58:12 +0100
commitf977075b43abf5a326d48cafaedee26181ae7d8c (patch)
treee0aa1e1edaa39227fd8dc25c313ec955a83a538e
parent336dc70047707e8cdd879e6dc18ed532a8f1cb33 (diff)
parent1b12884c7d9776ace7255e0ee1e3b6e274bc9fb3 (diff)
downloadforums-f977075b43abf5a326d48cafaedee26181ae7d8c.tar
forums-f977075b43abf5a326d48cafaedee26181ae7d8c.tar.gz
forums-f977075b43abf5a326d48cafaedee26181ae7d8c.tar.bz2
forums-f977075b43abf5a326d48cafaedee26181ae7d8c.tar.xz
forums-f977075b43abf5a326d48cafaedee26181ae7d8c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
-rw-r--r--phpBB/install/database_update.php11
-rw-r--r--phpBB/install/schemas/schema_data.sql4
2 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7149b0e9f8..c93976a8cf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1849,6 +1849,17 @@ function change_database_data(&$no_updates, $version)
// Unread posts search load switch
set_config('load_unreads_search', '1');
+ // Reduce queue interval to 60 seconds, email package size to 20
+ if ($config['queue_interval'] == 600)
+ {
+ set_config('queue_interval', '60');
+ }
+
+ if ($config['email_package_size'] == 50)
+ {
+ set_config('email_package_size', '20');
+ }
+
$no_updates = false;
break;
}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f1f482b66d..cbee2c9ba1 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -94,7 +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_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_package_size', '50');
+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_pm_icons', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_post_confirm', '1');
@@ -209,7 +209,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50'
INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_recipients', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page', '10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '60');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path', 'images/ranks');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('referer_validation', '1');