diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-08-04 18:06:17 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-08-09 15:12:02 +0200 |
| commit | 70d42afb936293e5f8caefd0ee2224c4c5f0bcf3 (patch) | |
| tree | 897322e0766cadec84fce3b0ead80736dc9c68ae /lib/private/Mail | |
| parent | c78e999b2113c088d156f396e83759686635dec0 (diff) | |
| download | nextcloud-server-70d42afb936293e5f8caefd0ee2224c4c5f0bcf3.tar.gz nextcloud-server-70d42afb936293e5f8caefd0ee2224c4c5f0bcf3.zip | |
Use non-deprecated INTL_IDNA_VARIANT_UTS46
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'lib/private/Mail')
| -rw-r--r-- | lib/private/Mail/Mailer.php | 2 | ||||
| -rw-r--r-- | lib/private/Mail/Message.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index e438f75d2ce..d232587df63 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -170,7 +170,7 @@ class Mailer implements IMailer { } list($name, $domain) = explode('@', $email, 2); - $domain = idn_to_ascii($domain); + $domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46); return $name.'@'.$domain; } diff --git a/lib/private/Mail/Message.php b/lib/private/Mail/Message.php index 5ffc050360a..2d3c49d0ce1 100644 --- a/lib/private/Mail/Message.php +++ b/lib/private/Mail/Message.php @@ -58,11 +58,11 @@ class Message { foreach($addresses as $email => $readableName) { if(!is_numeric($email)) { list($name, $domain) = explode('@', $email, 2); - $domain = idn_to_ascii($domain); + $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46); $convertedAddresses[$name.'@'.$domain] = $readableName; } else { list($name, $domain) = explode('@', $readableName, 2); - $domain = idn_to_ascii($domain); + $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46); $convertedAddresses[$email] = $name.'@'.$domain; } } |