diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-06-14 20:56:36 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-06-14 20:56:36 +0200 |
| commit | fb56cdb3efd11f4ec6cf053b8f04cc51a7d3bd4e (patch) | |
| tree | fd81b4a7064f3dba7bdfadbd7a29424539cef324 /system/libraries/Email.php | |
| parent | f34668f94b6a69fa777c6025ccc798b5e3c1110f (diff) | |
| parent | 30e2eafa86c4c7b6b39cea3e7089a90df9f603fb (diff) | |
Merge tag '3.1.9' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index a53e7e72a..cd74d6da1 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1038,7 +1038,11 @@ class CI_Email { $domain = defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) : idn_to_ascii($domain); - $email = $account.'@'.$domain; + + if ($domain !== FALSE) + { + $email = $account.'@'.$domain; + } } return (bool) filter_var($email, FILTER_VALIDATE_EMAIL); @@ -1859,7 +1863,11 @@ class CI_Email { $domain = defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) : idn_to_ascii($domain); - $email = $account.'@'.$domain; + + if ($domain !== FALSE) + { + $email = $account.'@'.$domain; + } } return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email)); |