Changeset 2279 for branches


Ignore:
Timestamp:
Mar 17, 2008, 9:18:31 PM (17 years ago)
Author:
rub
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1_7/include/functions_mail.inc.php

    r2139 r2279  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
     
    9999  global $conf;
    100100
     101  // Spring cleaning
     102  $cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
     103
    101104  if ($conf['enabled_format_email'])
    102105  {
    103106    // Spring cleaning
    104107    $cvt_name = trim(preg_replace('#[\n\r]+#s', '', $name));
    105     $cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
    106108
    107109    if ($cvt_name!="")
     
    748750function pwg_send_mail($result, $to, $subject, $content, $headers)
    749751{
    750  if (!$result)
    751  {
     752  if (!$result)
     753  {
    752754    global $conf_mail;
    753755
     
    772774      }
    773775    }
    774  }
     776  }
     777  else
     778  {
     779    return $result;
     780  }
    775781}
    776782
Note: See TracChangeset for help on using the changeset viewer.