summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-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 cbfd670e7..943500e7e 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1017,7 +1017,7 @@ class CI_Email {
$domain = defined('INTL_IDNA_VARIANT_UTS46')
? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46)
: idn_to_ascii($matches[2]);
- //If idn_to_ascii() fails, treat it like it doesn't exists
+
if ($domain !== FALSE)
{
$email = $account.'@'.$domain;
@@ -1832,7 +1832,7 @@ class CI_Email {
$domain = defined('INTL_IDNA_VARIANT_UTS46')
? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
: idn_to_ascii($domain);
- //If idn_to_ascii() fails, treat it like it doesn't exists
+
if ($domain !== FALSE)
{
$email = $account.'@'.$domain;
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 5c1c2e2e8..e14dc3168 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1240,7 +1240,7 @@ class CI_Form_validation {
$domain = defined('INTL_IDNA_VARIANT_UTS46')
? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46)
: idn_to_ascii($matches[2]);
- //If idn_to_ascii() fails, treat it like it doesn't exists
+
if ($domain !== FALSE)
{
$str = $matches[1].'@'.$domain;