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>
This commit is contained in:
parent
1c891a5c90
commit
52c7f17faf
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue