[MKDoc-commit] [1.6] was rejecting perfectly valid email addresses

[bruno at mkdoc.demon.co.uk]

Log Message:
-----------
[1.6] was rejecting perfectly valid email addresses

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/flo/plugin/Account:
        Subscribe.pm
    mkd/templates/error:
        en.html

-------------- next part --------------
Index: Subscribe.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/plugin/Account/Attic/Subscribe.pm,v
retrieving revision 1.21.2.12
retrieving revision 1.21.2.13
diff -Lflo/plugin/Account/Subscribe.pm -Lflo/plugin/Account/Subscribe.pm -u -r1.21.2.12 -r1.21.2.13
--- flo/plugin/Account/Subscribe.pm
+++ flo/plugin/Account/Subscribe.pm
@@ -88,7 +88,7 @@
 	return $self->http_get();
     };
     
-    ($email =~ /[^A-Za-z0-9 at ._-]/) and do {
+    ($email =~ /[^A-Za-z0-9'@._+-]/) and do {
 	new MKDoc::Ouch 'subscribe/malformed_email';
 	return $self->http_get();
     };
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/error/Attic/en.html,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -Ltemplates/error/en.html -Ltemplates/error/en.html -u -r1.1.2.23 -r1.1.2.24
--- templates/error/en.html
+++ templates/error/en.html
@@ -135,7 +135,7 @@
     </li>
 
     <li petal:condition="error/is --subscribe/malformed_email">
-      Please enter a valid e-email address (no special characters).
+      Please enter a valid email address (no special characters).
     </li>
 
     <li petal:condition="error/is --user/delete/admin">