diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-27 14:03:21 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-27 14:03:21 +0000 |
| commit | eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7 (patch) | |
| tree | af859ffc65e38151e228920c6a97918d32755e06 | |
| parent | 936d5e67e351c9b2427b4ecc9ddb6c7c6b2b9891 (diff) | |
| download | forums-eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7.tar forums-eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7.tar.gz forums-eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7.tar.bz2 forums-eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7.tar.xz forums-eba70d3bb9e168dd4b3bd2c2bb8bf020a7cdb5c7.zip | |
arrgghhhhh I hate regexp
git-svn-id: file:///svn/phpbb/trunk@1969 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 91b4b62afc..289264a4e1 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}([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; + $patterns[1] = "#\[url\]([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; $replacements[1] = $bbcode_tpl['url1']; // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). - $patterns[2] = "#\[url\]([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; + $patterns[2] = "#\[url\]([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; $replacements[2] = $bbcode_tpl['url2']; // [url=xxxx://www.phpbb.com]phpBB[/url] code.. - $patterns[3] = "#\[url=([a-z]+?://){1}([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\](.*?)\[/url\]#si"; + $patterns[3] = "#\[url=([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\](.*?)\[/url\]#si"; $replacements[3] = $bbcode_tpl['url3']; // [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix). - $patterns[4] = "#\[url=([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\]([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; + $patterns[4] = "#\[url=([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\]([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si"; $replacements[4] = $bbcode_tpl['url4']; // [email]user@domain.tld[/email] code.. - $patterns[5] = "#\[email\]([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/email\]#si"; + $patterns[5] = "#\[email\]([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/email\]#si"; $replacements[5] = $bbcode_tpl['email']; $text = preg_replace($patterns, $replacements, $text); |