Changeset 2280 for trunk

Timestamp:

Mar 17, 2008, 9:22:05 PM (17 years ago)

Author:

rub

Message:

Resolved issue 0000812: Format error with "$confenabled_format_email = false;"

Merge branch-1_7 2278:2279 into BSF

File:

• trunk/include/functions_mail.inc.php (modified) (3 diffs)

trunk/include/functions_mail.inc.php

@@ -99 +99 @@
   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!="")
@@ -740 +742 @@
 function pwg_send_mail($result, $to, $subject, $content, $headers)
 {
- if (!$result)
- {
+  if (!$result)
+  {
     global $conf_mail;
 
@@ -764 +766 @@
       }
     }
- }
+  }
+  else
+  {
+    return $result;
+  }
 }