diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-02-12 17:55:52 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-02-12 17:55:52 +0000 |
| commit | 1efaa0f9cb4d9b54072be07a0de7d88a6dbb3409 (patch) | |
| tree | 36a2c89da45cc645c05b5b04b0ef91a03b9423a9 | |
| parent | 2b4c5320277e732da3f1347d17cb4c83b98d492e (diff) | |
| download | forums-1efaa0f9cb4d9b54072be07a0de7d88a6dbb3409.tar forums-1efaa0f9cb4d9b54072be07a0de7d88a6dbb3409.tar.gz forums-1efaa0f9cb4d9b54072be07a0de7d88a6dbb3409.tar.bz2 forums-1efaa0f9cb4d9b54072be07a0de7d88a6dbb3409.tar.xz forums-1efaa0f9cb4d9b54072be07a0de7d88a6dbb3409.zip | |
doh
git-svn-id: file:///svn/phpbb/trunk@2115 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 801af47876..0c76f7e0f0 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -209,7 +209,7 @@ function bbencode_second_pass($text, $uid) $replacements[4] = $bbcode_tpl['url4']; // [email]user@domain.tld[/email] code.. - $patterns[5] = "#\[email\]([a-z0-9\-_.]+?@[\w\-]+\.[\w\-\.]+\.[\w]+)\[/email\]#si"; + $patterns[5] = "#\[email\]([a-z0-9\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+)\[/email\]#si"; $replacements[5] = $bbcode_tpl['email']; $text = preg_replace($patterns, $replacements, $text); @@ -612,7 +612,7 @@ function make_clickable($text) // matches an email@domain type address at the start of a line, or after a space. // Note: Only the followed chars are valid; alphanums, "-", "_" and or ".". - $ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.[\w\-\.]+\.[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret); + $ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)?[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret); // Remove our padding.. $ret = substr($ret, 1); |