adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-04 08:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000812: Format error with "$conf['enabled_format_email'] = false;"

Browse Source 
Merge branch-1_7 2278:2279 into BSF

git-svn-id: http://piwigo.org/svn/trunk@2280 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2008-03-17 20:22:05 +00:00
parent a6437b81e6
commit 5a140f84bd
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_mail.inc.php
+10 -4
View File
@@ -98,11 +98,13 @@ function format_email($name, $email)
{
global $conf;
// Spring cleaning
$cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
if ($conf['enabled_format_email'])
{
// Spring cleaning
$cvt_name = trim(preg_replace('#[\n\r]+#s', '', $name));
$cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
if ($cvt_name!="")
{
@@ -739,8 +741,8 @@ function pwg_mail($to, $args = array())
*/
function pwg_send_mail($result, $to, $subject, $content, $headers)
{
if (!$result)
{
if (!$result)
{
global $conf_mail;
if ($conf_mail['use_smtp'])
@@ -763,7 +765,11 @@ function pwg_send_mail($result, $to, $subject, $content, $headers)
return mail($to, $subject, $content, $headers);
}
}
}
}
else
{
return $result;
}
}
/*Testing block*/