summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-01-27 05:09:02 +0100
committerAndrey Andreev <narf@devilix.net>2018-01-27 05:09:02 +0100
commit7c71b8f571585655d24ce325fb0ec3deb6caa8e4 (patch)
tree6182c3f84740d85bf89eff072e334c168bcddea1
parent329dd039a211ed7634b45e2c908f7dc375b806a2 (diff)
[ci skip] Apply the INTL_IDNA_VARIANT_UTS46 fix to CI_Email::_validate_email_for_shell()
-rw-r--r--system/libraries/Email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 71740ee5e..a53e7e72a 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1856,7 +1856,7 @@ class CI_Email {
if (function_exists('idn_to_ascii') && strpos($email, '@'))
{
list($account, $domain) = explode('@', $email, 2);
- $domain = is_php('5.4')
+ $domain = defined('INTL_IDNA_VARIANT_UTS46')
? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
: idn_to_ascii($domain);
$email = $account.'@'.$domain;