Ignore:
Timestamp:
Mar 3, 2012 8:20:14 AM (15 months ago)
Author:
alec
Message:
  • Apply fixes from trunk
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/release-0.7/program/steps/mail/sendmail.inc

    r5843 r5952  
    177177    } else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) { 
    178178      $address = $matches[0]; 
    179       $name = trim(str_replace($address, '', $item), '" '); 
     179      $name = trim(str_replace($address, '', $item)); 
     180      if ($name[0] == '"' && $name[count($name)-1] == '"') { 
     181        $name = substr($name, 1, -1); 
     182      } 
     183      $name = stripcslashes($name); 
    180184      $address = rcube_idn_to_ascii(trim($address, '<>')); 
    181185      $result[] = format_email_recipient($address, $name); 
Note: See TracChangeset for help on using the changeset viewer.