diff options
| author | thomascube <thomas@roundcube.net> | 2011-02-09 10:51:50 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-02-09 10:51:50 +0000 |
| commit | b46e5b7407940499964d8a553c3eada05850f29d (patch) | |
| tree | 882ffd6820097107176c1ba2e8341c0313f18ec2 /program/steps/addressbook | |
| parent | 98cb0f179206843ceaa87df6bfb3d1da045ed8ad (diff) | |
Apply more bugfixes from trunk for 0.5.1
Diffstat (limited to 'program/steps/addressbook')
| -rw-r--r-- | program/steps/addressbook/import.inc | 2 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index ceb683227..7f979de82 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -136,7 +136,7 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name' } // We're using UTF8 internally - $email = idn_to_utf8($email); + $email = rcube_idn_to_utf8($email); if (!$replace) { // compare e-mail address diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 1c70b89b6..c3a3a69e9 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -49,8 +49,8 @@ foreach ($a_save_cols as $col) { } // Validity checks -$_email = idn_to_ascii($a_record['email']); -if (!check_email($_email, false)) { +$_email = rcube_idn_to_ascii($a_record['email']); +if (!check_email($_email)) { $OUTPUT->show_message('emailformaterror', 'warning', array('email' => $_email)); rcmail_overwrite_action($return_action); return; |