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/Form_validation.php | |
| parent | 61dfda5953f99813f8309a4fa843c255b6631224 (diff) | |
| parent | d282d07dfba94b5395d1dd989bdb958c972bb7cf (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/libraries/Form_validation.php')
| -rw-r--r-- | system/libraries/Form_validation.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 0dfb274b2..ee9ea6850 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1237,7 +1237,7 @@ class CI_Form_validation { { if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) { - $str = $matches[1].'@'.idn_to_ascii($matches[2]); + $str = $matches[1].'@'.idn_to_ascii($matches[2], INTL_IDNA_VARIANT_UTS46); } return (bool) filter_var($str, FILTER_VALIDATE_EMAIL); |