aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-08-09 22:10:12 +0000
committerrub <rub@piwigo.org>2006-08-09 22:10:12 +0000
commite097dba6a6a7220b0a109672bc68d32c4d70217c (patch)
tree2e891f7f44e6692f3ceae2a6e2af4b2217387a6a /admin/include
parent9d38573074ff6601b3f3592bfbf2718b2e63382c (diff)
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
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_notification_by_mail.inc.php9
1 files changed, 9 insertions, 0 deletions
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