diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-11-15 13:37:24 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-11-15 13:37:24 +0100 |
| commit | 432a9130059873551d1cff3e40d1d8432f552b96 (patch) | |
| tree | aabda9878719055ea2ab6c375c29dacb792b5f2f /system/libraries | |
| parent | 212df3650c30ce93219168d3305f374d8b8ece37 (diff) | |
| parent | ee8324368f2844aae0d558f1d194419a2181c281 (diff) | |
Merge branch '3.1-stable' into develop
Note: This intentionally reverts ee8324368f2844aae0d558f1d194419a2181c281
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index f115d9f40..6e28989cb 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1014,7 +1014,7 @@ class CI_Email { */ public function valid_email($email) { - if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) + if (function_exists('idn_to_ascii') && strpos($email, '@')) { $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46); } @@ -1821,7 +1821,7 @@ class CI_Email { */ protected function _validate_email_for_shell(&$email) { - if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) + if (function_exists('idn_to_ascii') && strpos($email, '@')) { $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46); } |