From e097dba6a6a7220b0a109672bc68d32c4d70217c Mon Sep 17 00:00:00 2001 From: rub Date: Wed, 9 Aug 2006 22:10:12 +0000 Subject: Resolved Issue ID 0000507: o format of email o max_execution_time equal to 0 o -f with only adress mail o use of standard function get_webmaster_mail_address 2 news $conf parameters. Merge branch-1_6 r1529:1530 into BSF git-svn-id: http://piwigo.org/svn/trunk@1531 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions_notification_by_mail.inc.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'admin/include') diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index 52fcba269..17283212e 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -34,6 +34,15 @@ $env_nbm = array 'is_sendmail_timeout' => false ); +if + ( + (!isset($env_nbm['sendmail_timeout'])) or + (!is_numeric($env_nbm['sendmail_timeout'])) or + ($env_nbm['sendmail_timeout'] <= 0) + ) +{ + $env_nbm['sendmail_timeout'] = $conf['nbm_treatment_timeout_default']; +} /* * Search an available check_key -- cgit v1.2.3