diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-06-09 22:30:27 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-06-09 22:30:27 +0000 |
| commit | 4444e48d2e020f67ec95474e6ace413768b85df3 (patch) | |
| tree | df3ee478716fe6894f68b32b208d7292024f8c64 /phpBB | |
| parent | cc6d084368a260be9e0c44d3d09da46c250ea776 (diff) | |
| download | forums-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')
| -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 1004624de2..998fea5de8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -120,6 +120,7 @@ <li>[Fix] Allow moving posts to invisible forums. (#27325)</li> <li>[Fix] Don't allow promoting unapproved group members (#16124)</li> <li>[Fix] Correctly fetch server name if using non-standard port (#27395)</li> + <li>[Fix] Regular expression for email matching in posts will no longer die on long words.</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> 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\'\.\-_\+\|]|&)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+'; + return '(?:[a-z0-9\'\.\-_\+\|]++|&)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+'; break; case 'bbcode_htm': |