aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2008-06-09 22:32:51 +0000
committerNils Adermann <naderman@naderman.de>2008-06-09 22:32:51 +0000
commitd168abdcc9ef4d76f9335a0267994f85ae906ec3 (patch)
treecb3f222323a872680a3ecc9e44e0da65d6e65f59
parent50f5502cc9d83d109f881de88d4702d7fc6c2176 (diff)
downloadforums-d168abdcc9ef4d76f9335a0267994f85ae906ec3.tar
forums-d168abdcc9ef4d76f9335a0267994f85ae906ec3.tar.gz
forums-d168abdcc9ef4d76f9335a0267994f85ae906ec3.tar.bz2
forums-d168abdcc9ef4d76f9335a0267994f85ae906ec3.tar.xz
forums-d168abdcc9ef4d76f9335a0267994f85ae906ec3.zip
Regular expression for email matching in posts will no longer die on long words
git-svn-id: file:///svn/phpbb/trunk@8642 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index bdc081c593..a483871d3a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2750,7 +2750,7 @@ function get_preg_expression($mode)
switch ($mode)
{
case 'email':
- return '(?:[a-z0-9\'\.\-_\+\|]|&amp;)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+';
+ return '(?:[a-z0-9\'\.\-_\+\|]++|&amp;)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+';
break;
case 'bbcode_htm':