diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/bbcode.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 0a9a747832..bcb6d2c3f8 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -193,23 +193,23 @@ function bbencode_second_pass($text, $uid) $replacements[0] = $bbcode_tpl['img']; // [url]xxxx://www.phpbb.com[/url] code.. - $patterns[1] = "#\[url\]([a-z]+?://){1}(.*?)\[/url\]#si"; + $patterns[1] = "#\[url\]([a-z]+?://){1}([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; $replacements[1] = $bbcode_tpl['url1']; // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). - $patterns[2] = "#\[url\](.*?)\[/url\]#si"; + $patterns[2] = "#\[url\]([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; $replacements[2] = $bbcode_tpl['url2']; // [url=xxxx://www.phpbb.com]phpBB[/url] code.. - $patterns[3] = "#\[url=([a-z]+?://){1}(.*?)\](.*?)\[/url\]#si"; + $patterns[3] = "#\[url=([a-z]+?://){1}([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\](.*?)\[/url\]#si"; $replacements[3] = $bbcode_tpl['url3']; // [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix). - $patterns[4] = "#\[url=(.*?)\](.*?)\[/url\]#si"; + $patterns[4] = "#\[url=([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\]([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; $replacements[4] = $bbcode_tpl['url4']; // [email]user@domain.tld[/email] code.. - $patterns[5] = "#\[email\](.*?)\[/email\]#si"; + $patterns[5] = "#\[email\]([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/email\]#si"; $replacements[5] = $bbcode_tpl['email']; $text = preg_replace($patterns, $replacements, $text); |