commit 7c71b8f571585655d24ce325fb0ec3deb6caa8e4
author Andrey Andreev <narf@devilix.net> Sat Jan 27 06:09:02 2018 +0200
committer Andrey Andreev <narf@devilix.net> Sat Jan 27 06:09:02 2018 +0200
tree 6182c3f84740d85bf89eff072e334c168bcddea1
parent 329dd039a211ed7634b45e2c908f7dc375b806a2

[ci skip] Apply the INTL_IDNA_VARIANT_UTS46 fix to CI_Email::_validate_email_for_shell()

system/libraries/Email.php

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 71740ee..a53e7e7 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1856,7 +1856,7 @@
 		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;