From 436dcead77e90cc68521b2565ee2f19ce707d62e Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 24 May 2004 18:09:28 +0000
Subject: - Patch #7725 by Marius: fixed glitch in e-mail address validation
 code.  A subset of all e-mail addresses was rejected as valid.

---
 includes/common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes')

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}';
 
-- 
cgit v1.2.3