aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-02-23 11:26:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-02-23 11:26:23 +0000
commit0a5c435102dbdfce9b773c5ba4c0a91e42141108 (patch)
treef9da733fdcef73b5b554196c40977bc5b3ccc66c /phpBB/includes/functions.php
parent435c1311276e4c7208f7be8704fa79a63bf54459 (diff)
downloadforums-0a5c435102dbdfce9b773c5ba4c0a91e42141108.tar
forums-0a5c435102dbdfce9b773c5ba4c0a91e42141108.tar.gz
forums-0a5c435102dbdfce9b773c5ba4c0a91e42141108.tar.bz2
forums-0a5c435102dbdfce9b773c5ba4c0a91e42141108.tar.xz
forums-0a5c435102dbdfce9b773c5ba4c0a91e42141108.zip
Fix Custom BBCode {EMAIL}-Token usage - #21155
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8387 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-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 385a1ea72e..43499e0eea 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2756,7 +2756,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':