Changeset 2279

Timestamp:

Mar 17, 2008, 9:18:31 PM (16 years ago)

Author:

rub

Message:

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

File:

• branches/branch-1_7/include/functions_mail.inc.php (modified) (4 diffs)

branches/branch-1_7/include/functions_mail.inc.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
@@ -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!="")
@@ -748 +750 @@
 function pwg_send_mail($result, $to, $subject, $content, $headers)
 {
- if (!$result)
- {
+  if (!$result)
+  {
     global $conf_mail;
 
@@ -772 +774 @@
       }
     }
- }
+  }
+  else
+  {
+    return $result;
+  }
 }