summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-11-09 16:27:59 +0100
committerAndrey Andreev <narf@devilix.net>2017-11-09 16:27:59 +0100
commit4541bf930e715917622dc2d225bf5517f99db35a (patch)
treee59bc61d482ff566955ccd0db90b1f6308e17c17 /system/libraries
parent44aa1ab0655283b67d6fdcb081803f25453dbc73 (diff)
[ci skip] Fix patch for #5300
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php4
-rw-r--r--system/libraries/Form_validation.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 48726b769..3b1da8de0 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1037,7 +1037,7 @@ class CI_Email {
if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
{
$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
- $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), $variant);
+ $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant);
}
return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
@@ -1855,7 +1855,7 @@ class CI_Email {
if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
{
$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
- $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), $variant);
+ $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant);
}
return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 1619ec9a9..cd1d4a759 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1232,7 +1232,7 @@ class CI_Form_validation {
if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
{
$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
- $str = $matches[1].'@'.idn_to_ascii($matches[2], $variant);
+ $str = $matches[1].'@'.idn_to_ascii($matches[2], 0, $variant);
}
return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);