aboutsummaryrefslogtreecommitdiffstats
path: root/password.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-10-18 21:37:08 +0000
committerplegall <plg@piwigo.org>2005-10-18 21:37:08 +0000
commit0aa1bcc73ceb24d91d5483171af994a05d2e60b0 (patch)
treebf9e9dc2461479e692e32c24c358f0c7b1739247 /password.php
parent7a37fded516452ec62ffb60124408b1120a81088 (diff)
- bug 159 and 166 fixed: parameter "options" for mail() function disabled by
default. git-svn-id: http://piwigo.org/svn/trunk@901 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--password.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/password.php b/password.php
index 0be971964..f5ee6b2f8 100644
--- a/password.php
+++ b/password.php
@@ -52,8 +52,15 @@ function pwg_mail($to, $from, $infos = '')
$content = $infos;
$content.= "\n\n-- \nPhpWebGallery ".PHPWG_VERSION;
-
- return mail($to, $subject, $content, $headers, $options);
+
+ if ($conf['mail_options'])
+ {
+ return mail($to, $subject, $content, $headers, $options);
+ }
+ else
+ {
+ return mail($to, $subject, $content, $headers);
+ }
}
// +-----------------------------------------------------------------------+