diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-10-16 10:11:00 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-10-16 10:11:00 +0200 |
| commit | 7907f98a963c0cb8625ecbb4d8a178c6d769339a (patch) | |
| tree | 0ae85eb89a0d774d36eaf0ddba9509cdced973d8 /system/libraries/Email.php | |
| parent | 61dfda5953f99813f8309a4fa843c255b6631224 (diff) | |
| parent | d282d07dfba94b5395d1dd989bdb958c972bb7cf (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 1dcafeddd..5943127bc 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1016,7 +1016,7 @@ class CI_Email { { if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) { - $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos)); + $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), INTL_IDNA_VARIANT_UTS46); } return (bool) filter_var($email, FILTER_VALIDATE_EMAIL); @@ -1823,7 +1823,7 @@ class CI_Email { { if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) { - $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos)); + $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), INTL_IDNA_VARIANT_UTS46); } return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email)); |