summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-05-24 18:09:28 +0000
committerDries Buytaert <dries@buytaert.net>2004-05-24 18:09:28 +0000
commit436dcead77e90cc68521b2565ee2f19ce707d62e (patch)
treea3119963c8c5cb713e08981fecafc3e2fd4df2c6
parent01f08e86dda86c9617935d467bb6f50dc95d1462 (diff)
downloadbrdo-436dcead77e90cc68521b2565ee2f19ce707d62e.tar.gz
brdo-436dcead77e90cc68521b2565ee2f19ce707d62e.tar.bz2
- Patch #7725 by Marius: fixed glitch in e-mail address validation code. A subset of all e-mail addresses was rejected as valid.
-rw-r--r--includes/common.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 5da3bda2c..7af86a4ca 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -596,7 +596,7 @@ function drupal_specialchars($input, $quotes = ENT_NOQUOTES) {
*/
function valid_email_address($mail) {
$user = '[a-zA-Z0-9_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\']+';
- $domain = '(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]\.?)+';
+ $domain = '(?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.?)+';
$ipv4 = '[0-9]{1,3}(\.[0-9]{1,3}){3}';
$ipv6 = '[0-9a-fA-F]{1,4}(\:[0-9a-fA-F]{1,4}){7}';