diff options
| author | Jared Boone <jared.boone@sony.com> | 2018-04-05 11:28:31 -0700 |
|---|---|---|
| committer | Jared Boone <jared.boone@sony.com> | 2018-04-05 11:28:31 -0700 |
| commit | 52c7f17faf347e10c8b2c89819c8fdb4de3ad4ee (patch) | |
| tree | ca753d26b9a5d6ed672122efd09d15956fdf08c0 | |
| parent | 1c891a5c908283102dfba94a43967f8b1285c6d5 (diff) | |
| download | nextcloud-server-52c7f17faf347e10c8b2c89819c8fdb4de3ad4ee.tar.gz nextcloud-server-52c7f17faf347e10c8b2c89819c8fdb4de3ad4ee.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>
| -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 3637bb1e27d..0590f3db12a 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -204,7 +204,7 @@ class Mailer implements IMailer { * @return string Converted mail address if `idn_to_ascii` exists */ protected function convertEmail($email) { - 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 c695f0f4fb1..4d9458fbd40 100644 --- a/lib/private/Mail/Message.php +++ b/lib/private/Mail/Message.php @@ -65,7 +65,7 @@ class Message implements IMessage { * @return array Converted addresses if `idn_to_ascii` exists */ protected function convertAddresses($addresses) { - if (!function_exists('idn_to_ascii')) { + if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46')) { return $addresses; } |