diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 00:03:25 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 00:03:25 +0100 |
| commit | 13948718c69b643ff608d357cc4bc400e2b7ee7b (patch) | |
| tree | 7b453069c0d6d3c54b138d33285dc0a9038f9f1c /phpBB/includes/functions.php | |
| parent | f3d332b78f483687b95c8892b6d585886b75fe07 (diff) | |
| parent | 950c72a8a578905b3c08b7fdf6f1a0df2a09f384 (diff) | |
| download | forums-13948718c69b643ff608d357cc4bc400e2b7ee7b.tar forums-13948718c69b643ff608d357cc4bc400e2b7ee7b.tar.gz forums-13948718c69b643ff608d357cc4bc400e2b7ee7b.tar.bz2 forums-13948718c69b643ff608d357cc4bc400e2b7ee7b.tar.xz forums-13948718c69b643ff608d357cc4bc400e2b7ee7b.zip | |
Merge pull request #3414 from rxu/ticket/13433
[ticket/13433] Fix parsing of email addresses
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 940484a0ea..4159af5678 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3347,7 +3347,7 @@ function get_preg_expression($mode) case 'email': // Regex written by James Watts and Francisco Jose Martin Moreno // http://fightingforalostcause.net/misc/2006/compare-email-regex.php - return '([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*(?:[\w\!\#$\%\'\*\+\-\/\=\?\^\`{\|\}\~]|&)+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,63})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)'; + return '((?:[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*(?:[\w\!\#$\%\'\*\+\-\/\=\?\^\`{\|\}\~]|&)+)@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,63})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)'; break; case 'bbcode_htm': |