diff options
author | alecpl <alec@alec.pl> | 2011-02-03 13:58:07 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-02-03 13:58:07 +0000 |
commit | e8d5bdc84ecfdf6fe5008655215a258bbdf0c521 (patch) | |
tree | 24e98fca92b72bcc0ba4b5519f5d2c9265a7c8d5 /program/steps/mail/sendmail.inc | |
parent | 9ebac6616d32d7672ea59da67321380037e2324c (diff) |
- Fix IDNA support when IDN/INTL modules are in use (#1487742)
Diffstat (limited to 'program/steps/mail/sendmail.inc')
-rw-r--r-- | program/steps/mail/sendmail.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 74b8c00df..118e9edeb 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -153,11 +153,11 @@ function rcmail_email_input_format($mailto, $count=false, $check=true) $item = trim($item); // address in brackets without name (do nothing) if (preg_match('/^<\S+@\S+>$/', $item)) { - $item = idn_to_ascii($item); + $item = rcube_idn_to_ascii($item); $result[] = $item; // address without brackets and without name (add brackets) } else if (preg_match('/^\S+@\S+$/', $item)) { - $item = idn_to_ascii($item); + $item = rcube_idn_to_ascii($item); $result[] = '<'.$item.'>'; // address with name (handle name) } else if (preg_match('/\S+@\S+>*$/', $item, $matches)) { @@ -168,7 +168,7 @@ function rcmail_email_input_format($mailto, $count=false, $check=true) && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name)) { $name = '"'.addcslashes($name, '"').'"'; } - $address = idn_to_ascii($address); + $address = rcube_idn_to_ascii($address); if (!preg_match('/^<\S+@\S+>$/', $address)) $address = '<'.$address.'>'; |