diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 14:47:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-18 14:47:43 +0000 |
| commit | 02a5032a52784339e75d0d3fc9c24e92e235c26b (patch) | |
| tree | 7be064ec5e37c3a81e35971a7f7d8c5519388f6c /phpBB/includes/functions.php | |
| parent | c34599126fe8a7d38b604ceb92136be6a6c89ee8 (diff) | |
| download | forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.gz forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.bz2 forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.xz forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.zip | |
merging... again
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
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 7a6e4c656d..5005033166 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2658,7 +2658,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': |