diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-03-23 14:24:06 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-03-23 14:24:06 +0100 |
| commit | d0f6e6ab2e1dbb968a0ef0021f0b9cd64313863b (patch) | |
| tree | a8cd95ddf85c9a852f522eae14dda0de4151d38b /system/libraries/Form_validation.php | |
| parent | 006cf0764295d37daa597f4ea9cf31abb75d1b68 (diff) | |
| parent | 71e647782764184e3aab4faffe6d99176758979f (diff) | |
Merge tag 'ci-upstream/3.1.8' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
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 3444c65a0..6a97ee599 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1231,7 +1231,7 @@ class CI_Form_validation { { if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) { - $domain = is_php('5.4') + $domain = defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46) : idn_to_ascii($matches[2]); $str = $matches[1].'@'.$domain; |