From 32e93292bbf68b1778aeb7ae041d5b11b0aa238d Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 25 May 2004 19:56:47 +0000
Subject: [PATCH] bugfix [ 948050 ] Correct email address not accepted (fix)

---
 docs/changelog/6.x.x.txt    | 2 ++
 lib/WebGUI/FormProcessor.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index ca4ea1218..00fc39fe8 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -12,6 +12,8 @@
  - Bugfix [ 952137 ] error deleting default content after install
  - Bugfix [ 947141 ] Bug in Forum - No Subject!!!
  - Bugfix [ 949923 ] Collateral changes owner when editing
+ - Bugfix [ 949923 ] Collateral changes owner when editing
+ - Bugfix [ 948050 ] Correct email address not accepted (fix)
 
 
 
diff --git a/lib/WebGUI/FormProcessor.pm b/lib/WebGUI/FormProcessor.pm
index cf5e1df19..289e4d8e2 100644
--- a/lib/WebGUI/FormProcessor.pm
+++ b/lib/WebGUI/FormProcessor.pm
@@ -68,7 +68,7 @@ These functions are available from this package:
 =cut
 
 sub _checkEmailAddy {
-        return ($_[0] =~ /^([A-Z0-9]+[._-]?){1,}([A-Z0-9]+[_-]?)+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i);
+        return ($_[0] =~ /^([A-Z0-9]+[._+-]?){1,}([A-Z0-9]+[_+-]?)+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i);
 }
 
 #-------------------------------------------------------------------