aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2008-06-09 22:30:27 +0000
committerNils Adermann <naderman@naderman.de>2008-06-09 22:30:27 +0000
commit4444e48d2e020f67ec95474e6ace413768b85df3 (patch)
treedf3ee478716fe6894f68b32b208d7292024f8c64 /phpBB/includes
parentcc6d084368a260be9e0c44d3d09da46c250ea776 (diff)
downloadforums-4444e48d2e020f67ec95474e6ace413768b85df3.tar
forums-4444e48d2e020f67ec95474e6ace413768b85df3.tar.gz
forums-4444e48d2e020f67ec95474e6ace413768b85df3.tar.bz2
forums-4444e48d2e020f67ec95474e6ace413768b85df3.tar.xz
forums-4444e48d2e020f67ec95474e6ace413768b85df3.zip
Regular expression for email matching in posts will no longer die on long words
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8641 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-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 0b6e4aafed..198004957c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2777,7 +2777,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':