diff options
| author | Jared Boone <jared.boone@gmail.com> | 2018-04-05 16:09:08 -0700 |
|---|---|---|
| committer | Jared Boone <jared.boone@gmail.com> | 2018-04-05 16:09:08 -0700 |
| commit | a5b50e487eb96786db0a3ff828ed7c84040f664c (patch) | |
| tree | d1208c633349a8242a1715f14fa58f0e480dad31 /lib/private/Mail | |
| parent | bbc4c6036a9cad0458ef4b426974962375701947 (diff) | |
| download | nextcloud-server-a5b50e487eb96786db0a3ff828ed7c84040f664c.tar.gz nextcloud-server-a5b50e487eb96786db0a3ff828ed7c84040f664c.zip | |
Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
Fixes https://github.com/nextcloud/server/issues/8387.
Signed-off-by: Jared Boone <jared.boone@gmail.com>
Diffstat (limited to 'lib/private/Mail')
| -rw-r--r-- | lib/private/Mail/Mailer.php | 2 | ||||
| -rw-r--r-- | lib/private/Mail/Message.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 5a054d2efd2..d55546769ee 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -205,7 +205,7 @@ class Mailer implements IMailer { * @return string Converted mail address if `idn_to_ascii` exists */ protected function convertEmail(string $email): string { - if (!function_exists('idn_to_ascii') || strpos($email, '@') === false) { + if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) { return $email; } diff --git a/lib/private/Mail/Message.php b/lib/private/Mail/Message.php index 622c18a9116..7c7ecae8578 100644 --- a/lib/private/Mail/Message.php +++ b/lib/private/Mail/Message.php @@ -66,7 +66,7 @@ class Message implements IMessage { * @return array Converted addresses if `idn_to_ascii` exists */ protected function convertAddresses(array $addresses): array { - if (!function_exists('idn_to_ascii')) { + if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46')) { return $addresses; } |