Permalink
Browse files

Merge remote-tracking branch 'thomasc/fix/email-regex' into rv

* thomasc/fix/email-regex:
  Fix email regex

Signed-off-by: Eric Merritt <eric.merritt@five9.com>
  • Loading branch information...
Eric Merritt
Eric Merritt committed Oct 10, 2012
2 parents b7cb6ee + 63271bf commit 22298f62b973d1aa1c344c1b23a22ce66fad1659
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/markdown.erl
View
@@ -1024,7 +1024,7 @@ get_email_addie(String) ->
{match, [{N, _} | _T]} ->
{Possible, [$> | T]} = lists:split(N, String),
EMail_regex = "[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+"
- ++ "(?:\.[a-za-Z0-9!#$%&'*+/=?^_`{|}~-]+)*"
+ ++ "(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*"
++ "@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+"
++ "(?:[a-zA-Z]{2}|com|org|net|gov|mil"
++ "|biz|info|mobi|name|aero|jobs|museum)",

0 comments on commit 22298f6

Please sign in to comment.