diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 00:19:10 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 00:19:10 +0100 |
| commit | ddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a (patch) | |
| tree | 2e904a49326378532bb227fd622a219e8179e931 /phpBB/includes/functions.php | |
| parent | 978b96cbf5559f2e3e5021afd551db9a2eeb6d9c (diff) | |
| parent | 13948718c69b643ff608d357cc4bc400e2b7ee7b (diff) | |
| download | forums-ddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a.tar forums-ddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a.tar.gz forums-ddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a.tar.bz2 forums-ddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a.tar.xz forums-ddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a.zip | |
Merge branch '3.1.x'
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 ce2528750e..66220d8864 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3176,7 +3176,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': |