diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 13:49:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 13:49:54 +0000 |
| commit | 274bd147ca29d61db26d3a0e5c717f4a5ab36d3d (patch) | |
| tree | 7268f14e0f229ab5f1894ea1a4f5a195d0ae1534 | |
| parent | 07829b38a1458e3a9debd0d1e0a6976baeafc224 (diff) | |
| download | forums-274bd147ca29d61db26d3a0e5c717f4a5ab36d3d.tar forums-274bd147ca29d61db26d3a0e5c717f4a5ab36d3d.tar.gz forums-274bd147ca29d61db26d3a0e5c717f4a5ab36d3d.tar.bz2 forums-274bd147ca29d61db26d3a0e5c717f4a5ab36d3d.tar.xz forums-274bd147ca29d61db26d3a0e5c717f4a5ab36d3d.zip | |
Allow & and | in local part of email addresses - #22995
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8447 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 287f32f5a4..804be705ef 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -139,6 +139,7 @@ <li>[Fix] Display "empty password error" within the login box instead of issuing a general error (Bug #22525)</li> <li>[Fix] Clean up who is online code in page_header (Bug #22715, thanks HighwayofLife)</li> <li>[Fix] Pertain select single link on memberlist (Bug #23235 - patch provided by Schumi)</li> + <li>[Fix] Allow & and | in local part of email addresses (Bug #22995)</li> </ul> diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5622b2dd6c..e61df309b3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2771,7 +2771,7 @@ function get_preg_expression($mode) switch ($mode) { case 'email': - return '[a-z0-9&\'\.\-_\+]+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+'; + return '(?:[a-z0-9\'\.\-_\+\|]|&)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+'; break; case 'bbcode_htm': |