diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-29 14:15:49 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-08-29 14:15:49 +0200 |
| commit | 0abc0dfca3c4e9e17da07edc864e009c13222174 (patch) | |
| tree | 60d16f2fa2dac215dfbe9d511c7aac262e5cdbe2 /system/libraries | |
| parent | 1d0bd83d0f4b9f133bf9657113fc50d57d767762 (diff) | |
Fix #4787
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Form_validation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 61f0298fd..c39b65d89 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1229,9 +1229,9 @@ class CI_Form_validation { */ public function valid_email($str) { - if (function_exists('idn_to_ascii') && $atpos = strpos($str, '@')) + if (function_exists('idn_to_ascii') && sscanf($str, '%[^@]@%s', $name, $domain) === 2) { - $str = substr($str, 0, ++$atpos).idn_to_ascii(substr($str, $atpos)); + $str = $name.'@'.idn_to_ascii($domain); } return (bool) filter_var($str, FILTER_VALIDATE_EMAIL); |